71/118: Revert old useBuildHook behaviour

[Ludovic Courtès]

civodul pushed a commit to branch nix
in repository guix.

commit ee3c5d7916b48d0c3b1cc08044e27209c14acfdc
Author: Eelco Dolstra <address@hidden>
Date:   Sat Jul 19 02:25:47 2014 +0200

    Revert old useBuildHook behaviour
---
 src/libstore/build.cc        |    2 +-
 src/libstore/globals.cc      |    2 +-
 src/nix-daemon/nix-daemon.cc |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index d594706..4376a83 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 2bfebb7..28982ec 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;
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index dde501d..f2141ee 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -552,7 +552,7 @@ static void performOp(bool trusted, unsigned int 
clientVersion,
         settings.set("build-max-jobs", int2String(readInt(from)));
         settings.set("build-max-silent-time", int2String(readInt(from)));
         if (GET_PROTOCOL_MINOR(clientVersion) >= 2)
-            if (readInt(from) != 0) settings.useBuildHook = true;
+            settings.useBuildHook = readInt(from) != 0;
         if (GET_PROTOCOL_MINOR(clientVersion) >= 4) {
             settings.buildVerbosity = (Verbosity) readInt(from);
             logType = (LogType) readInt(from);