nic/linuxcnc-nix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add override

Browse Source
This commit is contained in:
Nicolas Hiillos
2023-10-24 16:55:45 +03:00
parent fdb7588df1
commit e7486a5d18
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/linuxcnc.nix
View File

@@ -2,9 +2,12 @@
let let
cfg = config.local.packages.linuxcnc; cfg = config.local.packages.linuxcnc;
inherit (builtins) filter map pathExists listToAttrs; inherit (builtins) filter map pathExists listToAttrs;
linuxcncWithEC = pkgs.linuxcnc.overrideAttrs (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.linuxcnc-ethercat pkgs.hal-cia402 ];
});
linuxcncEnv = pkgs.buildEnv { linuxcncEnv = pkgs.buildEnv {
name = "linuxcnc-env"; name = "linuxcnc-env";
paths = with pkgs; [ linuxcnc hal-cia402 linuxcnc-ethercat ]; paths = with pkgs; [ linuxcncWithEC hal-cia402 linuxcnc-ethercat ];
}; };
in { in {
options.local.packages.linuxcnc.enable = lib.mkEnableOption "Enable linuxcnc"; options.local.packages.linuxcnc.enable = lib.mkEnableOption "Enable linuxcnc";

5
packages/linuxcnc-ethercat/default.nix
View File

@@ -14,17 +14,12 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
autoPatchelfHook
which which
expat expat
]; ];
buildInputs = [ linuxcnc ethercat ]; buildInputs = [ linuxcnc ethercat ];
preBuild = ''
#addAutoPatchelfSearchPath ${placeholder "out"}/lib/linuxcnc/modules/
'';
installFlags = [ installFlags = [
"prefix=${placeholder "out"}" "prefix=${placeholder "out"}"
#"RUN_IN_PLACE=YES" #"RUN_IN_PLACE=YES"