swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-24 14:10:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
This reverts commit be3d498b18.
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
# in `build-chroot-dirs' - otherwise any builder that uses
# /bin/sh won't work.
closureFile = pkgs.runCommand "closure" {
exportReferencesGraph = concatMap (pkg: [ "closure${baseNameOf pkg}" pkg ]) cfg.chrootClosures;
} "cat closure* | sort | uniq > $out";
binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
in
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
# WARNING: this file is generated.
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 {
default = "";
example = "
@ -260,8 +251,6 @@ in
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;
# List of machines for distributed Nix builds in the format