guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8365 from obsidiansystems/proto-structs

Browse Source 
Revert "Revert "Use template structs instead of phantoms""
This commit is contained in:
Théophane Hufschmitt
2023-05-22 09:34:34 +02:00
committed by GitHub
parent 3305fd0cb1 cb5052d98f
commit 673fe85976
10 changed files with 182 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstore/build/derivation-goal.cc
+2 -2
View File
@@ -1152,7 +1152,7 @@ HookReply DerivationGoal::tryBuildHook()
/* Tell the hook all the inputs that have to be copied to the
remote system. */
worker_proto::write(worker.store, hook->sink, inputPaths);
workerProtoWrite(worker.store, hook->sink, inputPaths);
/* Tell the hooks the missing outputs that have to be copied back
from the remote system. */
@@ -1163,7 +1163,7 @@ HookReply DerivationGoal::tryBuildHook()
if (buildMode != bmCheck && status.known && status.known->isValid()) continue;
missingOutputs.insert(outputName);
}
worker_proto::write(worker.store, hook->sink, missingOutputs);
workerProtoWrite(worker.store, hook->sink, missingOutputs);
}
hook->sink = FdSink();