diff --git a/flake.nix b/flake.nix index 7702598..7b4cf2b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,12 +7,11 @@ }; outputs = { self, nixpkgs, flake-compat, etherlab }@inputs: let - etherlab-pkgs = system: etherlab.packages.${system}; systems = nixpkgs.lib.platforms.linux; 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-pkgs 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 = etherlab.packages.${system}; }) v {}) packagePaths); legacyPackages = packages; overlay = final: prev: (lib.mapAttrs (n: v: prev.callPackage v { }) packagePaths); nixosModules = { linuxcnc = import ./modules/linuxcnc.nix; };