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:
commit
2eb706646a
1 changed files with 3 additions and 5 deletions
|
@ -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;
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue