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

* Make sure that build-chroot-dirs only contains directories.

Browse Source 
svn path=/nixos/trunk/; revision=13657
This commit is contained in:
Eelco Dolstra 2008-12-19 10:22:45 +00:00
parent 8a5bcfb934
commit 67451c470b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/default.nix
View File

@ -135,12 +135,13 @@ import ../helpers/make-etc.nix {
refs = pkgs.writeReferencesToFile binsh; refs = pkgs.writeReferencesToFile binsh;
in in
pkgs.runCommand "nix.conf" {} '' pkgs.runCommand "nix.conf" {} ''
binshDeps=$(for i in $(cat ${refs}); 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
build-max-jobs = ${toString (config.nix.maxJobs)} build-max-jobs = ${toString (config.nix.maxJobs)}
build-use-chroot = ${if config.nix.useChroot then "true" else "false"} build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $(cat ${refs})) build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $binshDeps)
${config.nix.extraOptions} ${config.nix.extraOptions}
END END
''; '';