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

Fix??

Browse Source
This commit is contained in:
Nicolas Hiillos
2023-10-23 16:01:22 +03:00
parent f101701806
commit d2e48d2904
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@@ -11,7 +11,7 @@
lib = nixpkgs.lib; lib = nixpkgs.lib;
packagePaths = lib.mapAttrs (n: v: "${./packages}/${n}") (lib.filterAttrs (n: v: v == "directory" && (builtins.readDir "${./packages}/${n}") ? "default.nix") (builtins.readDir ./packages)); packagePaths = lib.mapAttrs (n: v: "${./packages}/${n}") (lib.filterAttrs (n: v: v == "directory" && (builtins.readDir "${./packages}/${n}") ? "default.nix") (builtins.readDir ./packages));
in rec { in rec {
packages = lib.genAttrs systems (system: lib.mapAttrs (n: v: lib.callPackageWith ((lib.recursiveUpdate packages.${system} nixpkgs.legacyPackages.${system}) // { inherit inputs; inherit system; etherlab = etherlab.packages.${system}; }) v {}) packagePaths); packages = lib.genAttrs systems (system: lib.mapAttrs (n: v: lib.callPackageWith ((lib.recursiveUpdate packages.${system} nixpkgs.legacyPackages.${system}) // { inherit inputs; inherit system; } // etherlab.packages.${system}) v {}) packagePaths);
legacyPackages = packages; legacyPackages = packages;
overlay = final: prev: (lib.mapAttrs (n: v: prev.callPackage v { }) packagePaths); overlay = final: prev: (lib.mapAttrs (n: v: prev.callPackage v { }) packagePaths);
nixosModules = { linuxcnc = import ./modules/linuxcnc.nix; }; nixosModules = { linuxcnc = import ./modules/linuxcnc.nix; };

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

@@ -1,4 +1,4 @@
{ config, lib, pkgs, stdenv, linuxcnc-base, etherlab }: { config, lib, pkgs, stdenv, linuxcnc-base, ethercat }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = with pkgs; [ which expat ]; nativeBuildInputs = with pkgs; [ which expat ];
buildInputs = [ linuxcnc-base etherlab.ethercat ]; buildInputs = [ linuxcnc-base ethercat ];
installFlags = [ "DESTDIR=${placeholder "out"}" ]; installFlags = [ "DESTDIR=${placeholder "out"}" ];