mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert old useBuildHook behaviour

Browse source
This commit is contained in:
Eelco Dolstra 2014-07-19 02:25:47 +02:00
parent 2e77bd70fa
commit ee3c5d7916
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build.cc
View file

@ -1505,7 +1505,7 @@ void DerivationGoal::buildDone()
HookReply DerivationGoal::tryBuildHook() HookReply DerivationGoal::tryBuildHook()
{ {
if (!settings.useBuildHook) return rpDecline; if (!settings.useBuildHook || getEnv("NIX_BUILD_HOOK") == "") return rpDecline;
if (!worker.hook) if (!worker.hook)
worker.hook = std::shared_ptr<HookInstance>(new HookInstance); worker.hook = std::shared_ptr<HookInstance>(new HookInstance);

2
src/libstore/globals.cc
View file

@ -39,7 +39,7 @@ Settings::Settings()
thisSystem = SYSTEM; thisSystem = SYSTEM;
maxSilentTime = 0; maxSilentTime = 0;
buildTimeout = 0; buildTimeout = 0;
useBuildHook = getEnv("NIX_BUILD_HOOK") != ""; useBuildHook = true;
printBuildTrace = false; printBuildTrace = false;
reservedSize = 1024 * 1024; reservedSize = 1024 * 1024;
fsyncMetadata = true; fsyncMetadata = true;

2
src/nix-daemon/nix-daemon.cc
View file

@ -552,7 +552,7 @@ static void performOp(bool trusted, unsigned int clientVersion,
settings.set("build-max-jobs", int2String(readInt(from))); settings.set("build-max-jobs", int2String(readInt(from)));
settings.set("build-max-silent-time", int2String(readInt(from))); settings.set("build-max-silent-time", int2String(readInt(from)));
if (GET_PROTOCOL_MINOR(clientVersion) >= 2) if (GET_PROTOCOL_MINOR(clientVersion) >= 2)
if (readInt(from) != 0) settings.useBuildHook = true; settings.useBuildHook = readInt(from) != 0;
if (GET_PROTOCOL_MINOR(clientVersion) >= 4) { if (GET_PROTOCOL_MINOR(clientVersion) >= 4) {
settings.buildVerbosity = (Verbosity) readInt(from); settings.buildVerbosity = (Verbosity) readInt(from);
logType = (LogType) readInt(from); logType = (LogType) readInt(from);