From d2e48d29041e0228456e3f3672711401dfad1674 Mon Sep 17 00:00:00 2001 From: Nicolas Hiillos Date: Mon, 23 Oct 2023 16:01:22 +0300 Subject: [PATCH] Fix?? --- flake.nix | 2 +- packages/linuxcnc-ethercat/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 7b4cf2b..7886a5a 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ 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)); 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; overlay = final: prev: (lib.mapAttrs (n: v: prev.callPackage v { }) packagePaths); nixosModules = { linuxcnc = import ./modules/linuxcnc.nix; }; diff --git a/packages/linuxcnc-ethercat/default.nix b/packages/linuxcnc-ethercat/default.nix index 23725c1..a2652fe 100644 --- a/packages/linuxcnc-ethercat/default.nix +++ b/packages/linuxcnc-ethercat/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, stdenv, linuxcnc-base, etherlab }: +{ config, lib, pkgs, stdenv, linuxcnc-base, ethercat }: stdenv.mkDerivation rec { enableParallelBuilding = true; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = with pkgs; [ which expat ]; - buildInputs = [ linuxcnc-base etherlab.ethercat ]; + buildInputs = [ linuxcnc-base ethercat ]; installFlags = [ "DESTDIR=${placeholder "out"}" ];