delroth/nix-eval-jobs
0
0
Fork 0
forked from lix-project/nix-eval-jobs
Code Pull requests Activity

use platform instead of querySystem()

Browse source 
nix-build uses "system" from the derivation rather than the derivation attributes
This commit is contained in:
Jörg Thalheim 2023-09-12 09:01:51 +02:00
parent 6841d05ad7
commit 56f0464288
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/nix-eval-jobs.cc
View file

@ -201,11 +201,6 @@ struct Drv {
std::optional<nlohmann::json> meta; std::optional<nlohmann::json> meta;
Drv(EvalState &state, DrvInfo &drvInfo) { Drv(EvalState &state, DrvInfo &drvInfo) {
name = drvInfo.queryName();
system = drvInfo.querySystem();
if (system == "unknown")
throw EvalError("derivation '" + name +
"' must have a 'system' attribute");
auto localStore = state.store.dynamic_pointer_cast<LocalFSStore>(); auto localStore = state.store.dynamic_pointer_cast<LocalFSStore>();
@ -248,6 +243,8 @@ struct Drv {
for (auto &input : drv.inputDrvs) { for (auto &input : drv.inputDrvs) {
inputDrvs[localStore->printStorePath(input.first)] = input.second; inputDrvs[localStore->printStorePath(input.first)] = input.second;
} }
name = drvInfo.queryName();
system = drv.platform;
} }
}; };