diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-01-04 20:25:56 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-01-04 20:25:56 +0100 |
| commit | b4cb5280b0d1e474a4e6c50304599461adc285d0 (patch) | |
| tree | 84866ddf418926d7006a277d550d1da9bc536e74 /modules | |
| parent | 9081af7f422c6ebe8a2ddbc301ff638bb73a9337 (diff) | |
don't include build-sandbox-paths by default in nix.conf
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/nix/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 2733b8a..7c6ab55 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -15,7 +15,6 @@ let binshDeps = pkgs.writeReferencesToFile sh; in pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } '' - extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) cat > $out <<END # WARNING: this file is generated from the nix.* options in # your NixOS configuration, typically @@ -24,7 +23,9 @@ let build-max-jobs = ${toString (cfg.maxJobs)} build-cores = ${toString (cfg.buildCores)} build-use-sandbox = ${if (builtins.isBool cfg.useSandbox) then (if cfg.useSandbox then "true" else "false") else cfg.useSandbox} - build-sandbox-paths = ${toString cfg.sandboxPaths} /bin/sh=${sh} $(echo $extraPaths) + ${optionalString (cfg.sandboxPaths != []) '' + build-sandbox-paths = ${toString cfg.sandboxPaths} + ''} binary-caches = ${toString cfg.binaryCaches} trusted-binary-caches = ${toString cfg.trustedBinaryCaches} binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys} |