diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2020-03-23 13:27:54 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2020-03-23 13:27:54 +0100 |
commit | 7abe3bde8ade2941ca8a3dbb2b73b8cc9de2b1a1 (patch) | |
tree | c73ce56fe1bd47a5474bb2a51051aae1255f2a69 /src/libstore/globals.hh | |
parent | 4e67f89f380d97bab4018480e349d18e3850436f (diff) | |
parent | 160edd3f5d55bbe7e396c08f35e7b80bc1905e6b (diff) |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libstore/globals.hh')
-rw-r--r-- | src/libstore/globals.hh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index d0500be22..41bbed33f 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -311,12 +311,7 @@ public: Setting<bool> printMissing{this, true, "print-missing", "Whether to print what paths need to be built or downloaded."}; - Setting<std::string> preBuildHook{this, -#if __APPLE__ - nixLibexecDir + "/nix/resolve-system-dependencies", -#else - "", -#endif + Setting<std::string> preBuildHook{this, "", "pre-build-hook", "A program to run just before a build to set derivation-specific build settings."}; |