summaryrefslogtreecommitdiffstats
path: root/nixos/modules/misc
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2019-01-15 13:11:09 +0100
committerRobert Hensing <robert@roberthensing.nl>2019-01-15 13:11:09 +0100
commitdb7017362776cd04fc07ae89ec2d00f247df5ecd (patch)
tree278a166723a62706f65d0130a45e79c42a8b78f4 /nixos/modules/misc
parente8c996295762c91f9b208974a53568e3a38e588a (diff)
Revert "nixos/modules/misc/nixpkgs.nix: Use pure Nixpkgs function"
As a workaround for #51025 and https://github.com/NixOS/nix/issues/1232 This reverts commit 5f894a67f565129ac683434c3040ba85c2df3750.
Diffstat (limited to 'nixos/modules/misc')
-rw-r--r--nixos/modules/misc/nixpkgs.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 93fbf16841e5..3a717fddaba2 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -55,7 +55,7 @@ let
check = builtins.isAttrs;
};
- defaultPkgs = import ../../../pkgs/top-level/default.nix {
+ defaultPkgs = import ../../.. {
inherit (cfg) config overlays localSystem crossSystem;
};
@@ -68,7 +68,7 @@ in
pkgs = mkOption {
defaultText = literalExample
- ''import "''${nixos}/../pkgs/top-level" {
+ ''import "''${nixos}/.." {
inherit (cfg) config overlays localSystem crossSystem;
}
'';