diff options
| author | Jude Taylor <me@jude.bio> | 2015-10-21 14:39:08 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-10-21 14:39:08 -0700 |
| commit | 76f3ba42fd5516b46c07b8a7cc56f6ef8138f7cc (patch) | |
| tree | f5f1b4cae9e815101c0963b33ae49b6cc330552b /src | |
| parent | 2dc8e19a1792bf13fd05693aca47a7063e3f68d4 (diff) | |
move preBuildHook defaulting to globals.cc
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstore/build.cc | 7 | ||||
| -rw-r--r-- | src/libstore/globals.cc | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 19250fe24..2211191fb 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -59,12 +59,10 @@ /* chroot-like behavior from Apple's sandbox */ #if __APPLE__ #define SANDBOX_ENABLED 1 - #define DARWIN_PREBUILD 1 #define DEFAULT_ALLOWED_IMPURE_PREFIXES "/System/Library /usr/lib /dev /bin/sh" #else #define SANDBOX_ENABLED 0 #define DEFAULT_ALLOWED_IMPURE_PREFIXES "/bin" "/usr/bin" - #define DARWIN_PREBUILD 0 #endif #if CHROOT_ENABLED @@ -2047,11 +2045,6 @@ void DerivationGoal::startBuilder() } } -#if DARWIN_PREBUILD - if (settings.preBuildHook == "") - settings.preBuildHook = settings.nixLibexecDir + "/nix/resolve-system-dependencies.pl"; -#endif - if (settings.preBuildHook != "") { printMsg(lvlChatty, format("executing pre-build hook ‘%1%’") % settings.preBuildHook); diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 73f848943..e704837e8 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -77,6 +77,11 @@ void Settings::processEnvironment() nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR)); nixBinDir = canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR)); nixDaemonSocketFile = canonPath(nixStateDir + DEFAULT_SOCKET_PATH); + + // should be set with the other config options, but depends on nixLibexecDir +#ifdef __APPLE__ + preBuildHook = nixLibexecDir + "/nix/resolve-system-dependencies.pl"; +#endif } |