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

Fix building against nix master

Browse Source
This commit is contained in:
Eelco Dolstra
2018-10-30 14:41:21 +01:00
parent e0f204f3da
commit 8d26144121
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/hydra-queue-runner/queue-monitor.cc
View File

@ -428,8 +428,9 @@ Step::ptr State::createStep(ref<Store> destStore,
it's not runnable yet, and other threads won't make it
runnable while step->created == false. */
step->drv = readDerivation(drvPath);
step->parsedDrv = std::make_unique<ParsedDerivation>(drvPath, step->drv);
step->preferLocalBuild = step->drv.willBuildLocally();
step->preferLocalBuild = step->parsedDrv->willBuildLocally();
step->isDeterministic = get(step->drv.env, "isDetermistic", "0") == "1";
step->systemType = step->drv.platform;

3
src/hydra-queue-runner/state.hh
View File

@ -10,7 +10,7 @@
#include "db.hh"
#include "token-server.hh"
#include "derivations.hh"
#include "parsed-derivations.hh"
#include "pathlocks.hh"
#include "pool.hh"
#include "store-api.hh"
@ -152,6 +152,7 @@ struct Step
nix::Path drvPath;
nix::Derivation drv;
std::unique_ptr<nix::ParsedDerivation> parsedDrv;
std::set<std::string> requiredSystemFeatures;
bool preferLocalBuild;
bool isDeterministic;