public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "nixos/modules/misc/nixpkgs.nix: Use pure Nixpkgs function"

Browse Source 
As a workaround for #51025 and
https://github.com/NixOS/nix/issues/1232

This reverts commit 5f894a67f565129ac683434c3040ba85c2df3750.
This commit is contained in:
Robert Hensing 2019-01-15 13:11:09 +01:00
parent e8c9962957
commit db70173627
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/misc/nixpkgs.nix
View File

@ -55,7 +55,7 @@ let
check = builtins.isAttrs; check = builtins.isAttrs;
}; };
defaultPkgs = import ../../../pkgs/top-level/default.nix { defaultPkgs = import ../../.. {
inherit (cfg) config overlays localSystem crossSystem; inherit (cfg) config overlays localSystem crossSystem;
}; };
@ -68,7 +68,7 @@ in
pkgs = mkOption { pkgs = mkOption {
defaultText = literalExample defaultText = literalExample
''import "''${nixos}/../pkgs/top-level" { ''import "''${nixos}/.." {
inherit (cfg) config overlays localSystem crossSystem; inherit (cfg) config overlays localSystem crossSystem;
} }
''; '';