From b4cb5280b0d1e474a4e6c50304599461adc285d0 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 4 Jan 2017 20:25:56 +0100
Subject: don't include build-sandbox-paths by default in nix.conf

---
 modules/nix/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules')

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}
-- 
cgit v1.2.3