From 2cb25bd65c28df08070d139d8c9b96b8e6b8b9db Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 23 Jul 2013 10:00:54 +0200 Subject: [PATCH] Revert "Only include /bin/sh (not all of /bin) in the chroot" This reverts commit 883d310bac6cc6b7a136786688b6b55079558cb7. --- modules/services/misc/nix-daemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix index f28a793aefc..4563336a5bc 100644 --- a/modules/services/misc/nix-daemon.nix +++ b/modules/services/misc/nix-daemon.nix @@ -54,7 +54,7 @@ in options = { environment.nix = mkOption { - default = pkgs.nixUnstable; + default = pkgs.nix; merge = mergeOneOption; description = '' This option specifies the Nix package instance to use throughout the system. @@ -249,7 +249,7 @@ in config = { - nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin/sh=${config.system.build.binsh}/bin/bash" ]; + nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin" ]; environment.etc."nix/nix.conf".source = nixConf;