aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreldritch horrors <pennae@lix.systems>2024-03-04 07:16:31 +0100
committereldritch horrors <pennae@lix.systems>2024-03-04 07:16:31 +0100
commit64a269ef73b111d49037812bd899b5cb883158ef (patch)
tree68122cf2f42a7260a6e8755bbe4ea646d310fb41
parent13f78c557b402422aefc09cc217b001d83f08baa (diff)
Merge pull request #9600 from SharzyL/fix_nix_copy
fix: nix copy ssh-ng:// not respecting --substitute-on-destination (cherry picked from commit b1c633c6bb2e2dbc8a2891edf0d0c6f9d31d890b) Change-Id: I77356d14a9011d6dc4cf64776995f7590d918874
-rw-r--r--src/libstore/remote-store.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 3dcfb2d1d..4ff2881b9 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -225,7 +225,7 @@ StorePathSet RemoteStore::queryValidPaths(const StorePathSet & paths, Substitute
conn->to << WorkerProto::Op::QueryValidPaths;
WorkerProto::write(*this, *conn, paths);
if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 27) {
- conn->to << (settings.buildersUseSubstitutes ? 1 : 0);
+ conn->to << maybeSubstitute;
}
conn.processStderr();
return WorkerProto::Serialise<StorePathSet>::read(*this, *conn);