Move nix-ecuflash to nix-ecutuner to separate from EcuFlash (not FOSS)

This commit is contained in:
Joey Hafner 2024-11-01 21:20:48 -07:00
parent 60b228a4d8
commit 8680a7e003
7 changed files with 30 additions and 8 deletions

View File

@ -25,6 +25,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
git git
kdePackages.kdeconnect-kde kdePackages.kdeconnect-kde
nix-prefetch
]; ];
programs.home-manager = { programs.home-manager = {
enable = true; enable = true;

View File

@ -0,0 +1 @@
SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTR{idProduct}=="cc4d", GROUP="dialout", MODE="0666"

View File

@ -1,21 +1,20 @@
{ {
description = "A Nix flake for EcuFlash"; description = "A Nix flake with tools for working with ECUs";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
erosanix.url = "github:emmanuelrosa/erosanix";
}; };
outputs = { self, nixpkgs, erosanix }: { outputs = { self, nixpkgs }: {
packages.x86_64-linux = let packages.x86_64-linux = let
pkgs = import "${nixpkgs}" { pkgs = import "${nixpkgs}" {
system = "x86_64-linux"; system = "x86_64-linux";
}; };
in with (pkgs // erosanix.packages.x86_64-linux // erosanix.lib.x86_64-linux); { in with pkgs; {
default = self.packages.x86_64-linux.ecuflash; default = self.packages.x86_64-linux.ecuflash;
j2534 = callPackage ./j2534.nix {
ecuflash = callPackage ./ecuflash.nix { inherit libusb1 pkg-config;
inherit mkWindowsAppNoCC; inherit fetchFromGitHub;
wine = wineWowPackages.full; inherit stdenv;
}; };
}; };

View File

@ -0,0 +1,21 @@
{ stdenv, fetchFromGitHub, libusb1, pkg-config }:
stdenv.mkDerivation rec {
pname = "j2534";
version = "678252b";
src = fetchFromGitHub {
owner = "dschultzca";
repo = "j2534";
rev = "678252bbd0492f48df5e2d94e89cb5485b76d02f";
sha256 = "sha256-V76NtilaKjiT203lX8J0xGG1AZzdZK8Y66hynlQtqW0=";
};
dontDisableStatic = true;
buildInputs = [ libusb1 pkg-config ];
buildPhase = {
makefile = "j2534/makefile";
};
installPhase = ''
mkdir -p $out/lib
cp j2534.so $out/lib/${pname}.so
install -D ${./99-j2534.rules} $out/lib/udev/rules.d/99-j2534.rules
'';
}