@@ -140,7 +140,7 @@ import ../helpers/make-etc.nix { # coreutils and Perl) aren't visible. Sigh. nixDeps = pkgs.writeReferencesToFile config.environment.nix; 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) cat > $out <<END # WARNING: this file is generated. @@ -148,7 +148,7 @@ import ../helpers/make-etc.nix { build-max-jobs = ${toString (config.nix.maxJobs)} build-use-chroot = ${if config.nix.useChroot then "true" else "false"} build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths) - ${config.nix.extraOptions} + $extraOptions END ''; target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh. etc/default.nix a6bd9113f41cbe27c85c85b711755c11b89e11a4 eelco eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb http://github.com/jpick/nixos-xen64-nixos/commit/59bad88993819badb51e9badb021db800933e4e7 59bad88993819badb51e9badb021db800933e4e7 2009-02-27T06:08:38-08:00 2009-02-27T06:08:38-08:00 * Support special characters in config.nix.extraOptions. git-svn-id: https://svn.nixos.org/repos/nix/nixos/trunk@14278 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb b4bab7775d0455d1695a600d97b936ee9c730777 eelco eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb