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

* Support special characters in config.nix.extraOptions.

Browse Source 
Author:    eelco @ rev 14278

svn path=/nixos/branches/fix-style/; revision=14445
This commit is contained in:
Nicolas Pierron 2009-03-07 18:01:38 +00:00
parent 6013de33f8
commit 02ed3f12ed
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upstart-jobs/nix.nix
View File

@ -198,7 +198,7 @@ in
# coreutils and Perl) aren't visible. Sigh. # coreutils and Perl) aren't visible. Sigh.
nixDeps = pkgs.writeReferencesToFile config.environment.nix; nixDeps = pkgs.writeReferencesToFile config.environment.nix;
in in
pkgs.runCommand "nix.conf" {} '' pkgs.runCommand "nix.conf" {extraOptions = config.nix.extraOptions; } ''
extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); do if test -d $i; then echo $i; fi; done) extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); 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.
@ -206,7 +206,7 @@ in
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 $extraPaths) build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths)
${config.nix.extraOptions} $extraOptions
END END
''; '';
target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh. target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.