From db5b86ef13026d7f034527005ab231ddc2b7d2c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 30 Apr 2012 19:15:34 -0400 Subject: * Add an option ‘build-use-substitutes’, which can be set to ‘false’ to disable use of substitutes; i.e., force building from source. Fixes Nix/221. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/nix-worker/nix-worker.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/nix-worker') diff --git a/src/nix-worker/nix-worker.cc b/src/nix-worker/nix-worker.cc index 4b0c9e3191..c69b9de506 100644 --- a/src/nix-worker/nix-worker.cc +++ b/src/nix-worker/nix-worker.cc @@ -513,8 +513,13 @@ static void performOp(unsigned int clientVersion, logType = (LogType) readInt(from); printBuildTrace = readInt(from) != 0; } - if (GET_PROTOCOL_MINOR(clientVersion) >= 6) { + if (GET_PROTOCOL_MINOR(clientVersion) >= 6) buildCores = readInt(from); + if (GET_PROTOCOL_MINOR(clientVersion) >= 10) { + int x = readInt(from); + Strings ss; + ss.push_back(x == 0 ? "false" : "true"); + overrideSetting("build-use-substitutes", ss); } startWork(); stopWork(); -- cgit 1.4.1