ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into split-buildRemote

Browse Source
This commit is contained in:
John Ericson
2023-12-04 09:12:58 -05:00
parent 622c25e3c4 f216bce0e6
commit 67eeabd518
13 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/hydra-queue-runner/build-remote.cc
View File

@ -9,6 +9,8 @@
#include "path.hh"
#include "serve-protocol.hh"
#include "state.hh"
#include "current-process.hh"
#include "processes.hh"
#include "util.hh"
#include "serve-protocol.hh"
#include "serve-protocol-impl.hh"
@ -221,9 +223,9 @@ static BasicDerivation sendInputs(
{
BasicDerivation basicDrv(*step.drv);
for (const auto & input : step.drv->inputDrvs) {
auto drv2 = localStore.readDerivation(input.first);
for (auto & name : input.second) {
for (auto & [drvPath, node] : step.drv->inputDrvs.map) {
auto drv2 = localStore.readDerivation(drvPath);
for (auto & name : node.value) {
if (auto i = get(drv2.outputs, name)) {
auto outPath = i->path(localStore, drv2.name, name);
basicDrv.inputSrcs.insert(*outPath);