nixpkgs: add indirection to _module.args.pkgs

This allows pkgs to be overridden in such a way that `<nixpkgs>` is
never imported, allowing home-manager to be used in environments where
`NIX_PATH` is not set.

PR #993
This commit is contained in:
arcnmx 2020-01-15 12:57:26 -08:00 committed by Robert Helgesson
parent e5fb259872
commit 244d795325
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89

View file

@ -142,7 +142,7 @@ in
config = { config = {
_module.args = { _module.args = {
pkgs = _pkgs; pkgs = mkOverride modules.defaultPriority _pkgs;
pkgs_i686 = pkgs_i686 =
if _pkgs.stdenv.isLinux && _pkgs.stdenv.hostPlatform.isx86 if _pkgs.stdenv.isLinux && _pkgs.stdenv.hostPlatform.isx86
then _pkgs.pkgsi686Linux then _pkgs.pkgsi686Linux