about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2015-11-22T01·28-0500
committerShea Levy <shea@shealevy.com>2015-11-22T01·28-0500
commit6c10bd7c5e946424996e3628e74ba433207aa90e (patch)
treef422c3d1c167e78abc7a68b23f20521e376e1459 /src
parente0bd114e099810b58385142f1347891e3074a1ec (diff)
parent279fa8f618ff22cc71bf902a65cc29c04af6e01f (diff)
Merge branch 'host-deps' of git://github.com/pikajude/nix
Reintroduces the functionality that allows the baked-in pre-build-hook to find framework dependencies
Diffstat (limited to 'src')
-rw-r--r--src/libstore/build.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 9614bb1c3eb2..81ef701b0c13 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1927,7 +1927,7 @@ void DerivationGoal::startBuilder()
 
 #if SANDBOX_ENABLED
         additionalSandboxProfile = get(drv->env, "__sandboxProfile");
-#else
+#endif
         string allowed = settings.get("allowed-impure-host-deps", string(DEFAULT_ALLOWED_IMPURE_PREFIXES));
         PathSet allowedPaths = tokenizeString<StringSet>(allowed);
 
@@ -1953,7 +1953,6 @@ void DerivationGoal::startBuilder()
 
             dirsInChroot[i] = i;
         }
-#endif
 
 #if CHROOT_ENABLED
         /* Create a temporary directory in which we set up the chroot