summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-04-18 20:06:50 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-04-18 21:13:18 +0200
commit21a2f2ba3bc8962845f0b45cacac4e47557ebf13 (patch)
tree964881aeb4d4f5fa81de11594d06618febf16866 /nixos
parent961ad19660af9130dfc2306e3233236ed1c45e10 (diff)
nix: Add a "dev" output
This gets rid of boehm-dev in the closure (as well as Nix's own
headers).
Diffstat (limited to 'nixos')
-rw-r--r--nixos/default.nix2
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/default.nix b/nixos/default.nix
index 5d69b79e13a69..5f3e2ae081cc8 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -39,5 +39,5 @@ in
   vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
 
   # The following are used by nixos-rebuild.
-  nixFallback = pkgs.nixUnstable;
+  nixFallback = pkgs.nixUnstable.out;
 }
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 911f79e5756a3..10ac6f93cfdb6 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -65,8 +65,8 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.nix;
-        defaultText = "pkgs.nix";
+        default = pkgs.nix.out;
+        defaultText = "pkgs.nix.out";
         description = ''
           This option specifies the Nix package instance to use throughout the system.
         '';