diff options
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | pkgs/default.nix | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/flake.nix b/flake.nix index 0fa1c1e0..220095aa 100644 --- a/flake.nix +++ b/flake.nix @@ -286,7 +286,7 @@ pkgsStable = nixpkgs-stable.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system}; myPkgs = import ./pkgs { - inherit sysLib pkgs nixLib; + inherit pkgs nixLib; }; nixpkgs_as_input = nixpkgs; diff --git a/pkgs/default.nix b/pkgs/default.nix index 41bb654f..dfef2b60 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,21 +1,10 @@ { pkgs, - sysLib, nixLib, }: let inherit (pkgs) lib; - maybeMergeMessage = "the ./pkgs/by-name set"; - mMM = maybeMergeMessage; - callPackage = - lib.callPackageWith - (nixLib.warnMerge - (nixLib.warnMerge - pkgs - myPkgs - mMM) - {inherit sysLib;} - mMM); + callPackage = lib.callPackageWith (nixLib.warnMerge pkgs myPkgs "the ./pkgs/by-name set"); myPkgs = nixLib.mkByName { baseDirectory = ./by-name; |