Merge pull request #9600 from SharzyL/fix_nix_copy

fix: nix copy ssh-ng:// not respecting --substitute-on-destination
This commit is contained in:
Théophane Hufschmitt 2023-12-13 18:08:38 +01:00 committed by GitHub
commit b1c633c6bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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);