Merge pull request #259797 from K900/eval-config-pkgs

eval-config.nix: set nixpkgs.pkgs instead of _module.args.pkgs
This commit is contained in:
Robert Hensing 2023-10-10 13:18:30 +02:00 committed by GitHub
commit 2eb706646a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -34,9 +34,6 @@ evalConfigArgs@
in lib.optional (e != "") (import e) in lib.optional (e != "") (import e)
}: }:
let pkgs_ = pkgs;
in
let let
inherit (lib) optional; inherit (lib) optional;
@ -58,8 +55,9 @@ let
nixpkgs.system = lib.mkDefault system; nixpkgs.system = lib.mkDefault system;
}) })
++ ++
(optional (pkgs_ != null) { (optional (pkgs != null) {
_module.args.pkgs = lib.mkForce pkgs_; # This should be default priority, so it conflicts with any user-defined pkgs.
nixpkgs.pkgs = pkgs;
}) })
); );
}; };