vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Fix remote building on Nix 1.10

Browse source
This commit is contained in:
Eelco Dolstra 2015-07-31 03:41:55 +02:00
parent 5b9a288123
commit ff3f5eb4d8
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/hydra-queue-runner/build-remote.cc
View file

@ -189,11 +189,12 @@ void State::buildRemote(std::shared_ptr<StoreAPI> store,
} }
/* Gather the inputs. If the remote side is Nix <= 1.9, we have to /* Gather the inputs. If the remote side is Nix <= 1.9, we have to
copy the entire closure of ‘drvPath’, as well the required copy the entire closure of ‘drvPath’, as well as the required
outputs of the input derivations. On Nix > 1.9, we only need to outputs of the input derivations. On Nix > 1.9, we only need to
copy the immediate sources of the derivation and the required copy the immediate sources of the derivation and the required
outputs of the input derivations. */ outputs of the input derivations. */
PathSet inputs; PathSet inputs;
BasicDerivation basicDrv(step->drv);
if (sendDerivation) if (sendDerivation)
inputs.insert(step->drvPath); inputs.insert(step->drvPath);
@ -207,6 +208,7 @@ void State::buildRemote(std::shared_ptr<StoreAPI> store,
auto i = drv2.outputs.find(name); auto i = drv2.outputs.find(name);
if (i == drv2.outputs.end()) continue; if (i == drv2.outputs.end()) continue;
inputs.insert(i->second.path); inputs.insert(i->second.path);
basicDrv.inputSrcs.insert(i->second.path);
} }
} }
@ -228,7 +230,7 @@ void State::buildRemote(std::shared_ptr<StoreAPI> store,
if (sendDerivation) if (sendDerivation)
to << cmdBuildPaths << PathSet({step->drvPath}) << maxSilentTime << buildTimeout; to << cmdBuildPaths << PathSet({step->drvPath}) << maxSilentTime << buildTimeout;
else else
to << cmdBuildDerivation << step->drvPath << step->drv << maxSilentTime << buildTimeout; to << cmdBuildDerivation << step->drvPath << basicDrv << maxSilentTime << buildTimeout;
// FIXME: send maxLogSize. // FIXME: send maxLogSize.
to.flush(); to.flush();