Fix building against nix master
This commit is contained in:
parent
e0f204f3da
commit
8d26144121
|
@ -1,5 +1,5 @@
|
|||
{ hydraSrc ? builtins.fetchGit ./.
|
||||
, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.03-small"; }
|
||||
, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.09-small"; }
|
||||
, officialRelease ? false
|
||||
, shell ? false
|
||||
}:
|
||||
|
@ -111,6 +111,7 @@ rec {
|
|||
perlDeps perl nix
|
||||
postgresql95 # for running the tests
|
||||
boost
|
||||
nlohmann_json
|
||||
];
|
||||
|
||||
hydraPath = lib.makeBinPath (
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue