aboutsummaryrefslogtreecommitdiff
path: root/src/build-remote/build-remote.cc
diff options
context:
space:
mode:
authorRenzo Carbonara <gnuk0001@gmail.com>2018-01-09 22:40:07 +0100
committerRenzo Carbonara <gnuk0001@gmail.com>2018-01-09 22:40:07 +0100
commitb0328c244dd15da9e45f4e95d900c81fe0c47dda (patch)
tree2105096d5bbc526e1cf61884ede031fa85e5d30c /src/build-remote/build-remote.cc
parent3cd0704387eb10c4104ba06309ed38a6670b5660 (diff)
nix.conf: builders-use-substitutes
Fixes #937
Diffstat (limited to 'src/build-remote/build-remote.cc')
-rw-r--r--src/build-remote/build-remote.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc
index 445006b32..df579729a 100644
--- a/src/build-remote/build-remote.cc
+++ b/src/build-remote/build-remote.cc
@@ -218,9 +218,11 @@ connected:
signal(SIGALRM, old);
}
+ auto substitute = settings.buildersUseSubstitutes ? Substitute : NoSubstitute;
+
{
Activity act(*logger, lvlTalkative, actUnknown, fmt("copying dependencies to '%s'", storeUri));
- copyPaths(store, ref<Store>(sshStore), inputs, NoRepair, NoCheckSigs);
+ copyPaths(store, ref<Store>(sshStore), inputs, NoRepair, NoCheckSigs, substitute);
}
uploadLock = -1;
@@ -240,7 +242,7 @@ connected:
if (!missing.empty()) {
Activity act(*logger, lvlTalkative, actUnknown, fmt("copying outputs from '%s'", storeUri));
setenv("NIX_HELD_LOCKS", concatStringsSep(" ", missing).c_str(), 1); /* FIXME: ugly */
- copyPaths(ref<Store>(sshStore), store, missing, NoRepair, NoCheckSigs);
+ copyPaths(ref<Store>(sshStore), store, missing, NoRepair, NoCheckSigs, substitute);
}
return;