about summary refs log tree commit diff
path: root/src/libstore
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-19T00·25+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-19T00·25+0200
commitee3c5d7916b48d0c3b1cc08044e27209c14acfdc (patch)
treeeb6d72a7f7abf285ff13d9cb732a71a7c39f18e5 /src/libstore
parent2e77bd70faee34cb2518529318a54b39f2d9143e (diff)
Revert old useBuildHook behaviour
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/build.cc2
-rw-r--r--src/libstore/globals.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index d59470603295..4376a8322c42 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1505,7 +1505,7 @@ void DerivationGoal::buildDone()
 
 HookReply DerivationGoal::tryBuildHook()
 {
-    if (!settings.useBuildHook) return rpDecline;
+    if (!settings.useBuildHook || getEnv("NIX_BUILD_HOOK") == "") return rpDecline;
 
     if (!worker.hook)
         worker.hook = std::shared_ptr<HookInstance>(new HookInstance);
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 2bfebb77a130..28982ec15078 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -39,7 +39,7 @@ Settings::Settings()
     thisSystem = SYSTEM;
     maxSilentTime = 0;
     buildTimeout = 0;
-    useBuildHook = getEnv("NIX_BUILD_HOOK") != "";
+    useBuildHook = true;
     printBuildTrace = false;
     reservedSize = 1024 * 1024;
     fsyncMetadata = true;