diff options
| author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2009-03-07 18:01:38 +0000 |
|---|---|---|
| committer | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2009-03-07 18:01:38 +0000 |
| commit | 02ed3f12ed65b73ec7b738d85ecb6a11e12a9440 (patch) | |
| tree | 862b1dcc87dc5da1e8696e4c52ef516fab9c39a9 /upstart-jobs/nix.nix | |
| parent | 6013de33f866083d87bc93e3905867accb111f15 (diff) | |
| download | nixpkgs-02ed3f12ed65b73ec7b738d85ecb6a11e12a9440.tar nixpkgs-02ed3f12ed65b73ec7b738d85ecb6a11e12a9440.tar.gz nixpkgs-02ed3f12ed65b73ec7b738d85ecb6a11e12a9440.tar.bz2 nixpkgs-02ed3f12ed65b73ec7b738d85ecb6a11e12a9440.tar.lz nixpkgs-02ed3f12ed65b73ec7b738d85ecb6a11e12a9440.tar.xz nixpkgs-02ed3f12ed65b73ec7b738d85ecb6a11e12a9440.tar.zst nixpkgs-02ed3f12ed65b73ec7b738d85ecb6a11e12a9440.zip | |
* Support special characters in config.nix.extraOptions.
Author: eelco @ rev 14278 svn path=/nixos/branches/fix-style/; revision=14445
Diffstat (limited to 'upstart-jobs/nix.nix')
| -rw-r--r-- | upstart-jobs/nix.nix | 4 |
1 files 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. |