From 02ed3f12ed65b73ec7b738d85ecb6a11e12a9440 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:38 +0000
Subject: [PATCH] * Support special characters in config.nix.extraOptions.

 Author:    eelco @ rev 14278

svn path=/nixos/branches/fix-style/; revision=14445
---
 upstart-jobs/nix.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/nix.nix b/upstart-jobs/nix.nix
index 61ddbfbe80f..8b43036485e 100644
--- a/upstart-jobs/nix.nix
+++ b/upstart-jobs/nix.nix
@@ -198,7 +198,7 @@ in
             # 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.
@@ -206,7 +206,7 @@ in
               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.