use platform instead of querySystem()
nix-build uses "system" from the derivation rather than the derivation attributes
This commit is contained in:
parent
6841d05ad7
commit
56f0464288
|
@ -201,11 +201,6 @@ struct Drv {
|
|||
std::optional<nlohmann::json> meta;
|
||||
|
||||
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>();
|
||||
|
||||
|
@ -248,6 +243,8 @@ struct Drv {
|
|||
for (auto &input : drv.inputDrvs) {
|
||||
inputDrvs[localStore->printStorePath(input.first)] = input.second;
|
||||
}
|
||||
name = drvInfo.queryName();
|
||||
system = drv.platform;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue