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

Fix build

Browse Source
This commit is contained in:
Eelco Dolstra
2020-08-04 11:33:29 +02:00
parent 7b8a3acbf0
commit 7d3ba616a9
8 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,12 +260,13 @@ void State::buildRemote(ref<Store> destStore,
inputs.insert(p);
for (auto & input : step->drv->inputDrvs) {
Derivation drv2 = readDerivation(*localStore, localStore->printStorePath(input.first));
auto drv2 = localStore->readDerivation(input.first);
for (auto & name : input.second) {
auto i = drv2.outputs.find(name);
if (i == drv2.outputs.end()) continue;
inputs.insert(i->second.path);
basicDrv.inputSrcs.insert(i->second.path);
if (auto i = get(drv2.outputs, name)) {
auto outPath = i->path(*localStore, drv2.name);
inputs.insert(outPath);
basicDrv.inputSrcs.insert(outPath);
}
}
}
@ -433,7 +434,7 @@ void State::buildRemote(ref<Store> destStore,
auto now1 = std::chrono::steady_clock::now();
auto outputs = step->drv->outputPaths();
auto outputs = step->drv->outputPaths(*localStore);
/* Get info about each output path. */
std::map<StorePath, ValidPathInfo> infos;