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

Revert "Allow specifying packages whose closures should be in the chroot"

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

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

@ -29,12 +29,10 @@ let
# other paths in the store, we need the closure of /bin/sh # other paths in the store, we need the closure of /bin/sh
# in `build-chroot-dirs' - otherwise any builder that uses # in `build-chroot-dirs' - otherwise any builder that uses
# /bin/sh won't work. # /bin/sh won't work.
closureFile = pkgs.runCommand "closure" { binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
exportReferencesGraph = concatMap (pkg: [ "closure${baseNameOf pkg}" pkg ]) cfg.chrootClosures;
} "cat closure* | sort | uniq > $out";
in in
pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } '' pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
extraPaths=$(for i in $(cat ${closureFile}); do if test -e $i; then echo $i; fi; done) extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
cat > $out <<END cat > $out <<END
# WARNING: this file is generated. # WARNING: this file is generated.
build-users-group = nixbld build-users-group = nixbld
@ -97,13 +95,6 @@ in
''; '';
}; };
chrootClosures = mkOption {
default = [];
example = [ config.system.build.binsh pkgs.coreutils ];
description = "Packages whose closures should be included in the chroot";
type = types.listOf types.package;
};
extraOptions = mkOption { extraOptions = mkOption {
default = ""; default = "";
example = " example = "
@ -260,8 +251,6 @@ in
nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin/sh=${config.system.build.binsh}/bin/bash" ]; nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin/sh=${config.system.build.binsh}/bin/bash" ];
nix.chrootClosures = [ config.system.build.binsh ];
environment.etc."nix/nix.conf".source = nixConf; environment.etc."nix/nix.conf".source = nixConf;
# List of machines for distributed Nix builds in the format # List of machines for distributed Nix builds in the format