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

Revert "Only include /bin/sh (not all of /bin) in the chroot"

Browse Source 
This reverts commit 883d310bac.
This commit is contained in:
Rob Vermaas 2013-07-23 10:00:54 +02:00
parent 7163babe84
commit 2cb25bd65c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/services/misc/nix-daemon.nix
View File

@ -54,7 +54,7 @@ in
options = { options = {
environment.nix = mkOption { environment.nix = mkOption {
default = pkgs.nixUnstable; default = pkgs.nix;
merge = mergeOneOption; merge = mergeOneOption;
description = '' description = ''
This option specifies the Nix package instance to use throughout the system. This option specifies the Nix package instance to use throughout the system.
@ -249,7 +249,7 @@ in
config = { 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; environment.etc."nix/nix.conf".source = nixConf;