mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-10 08:16:15 +02:00
Restore Nix 2.3 behaviour for {__impure,__contentAddressed} = false
Fixes #8405.
This commit is contained in:
parent
f41dd2c306
commit
e4aebccf20
1 changed files with 6 additions and 8 deletions
|
@ -1152,16 +1152,14 @@ drvName, Bindings * attrs, Value & v)
|
||||||
if (i->value->type() == nNull) continue;
|
if (i->value->type() == nNull) continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i->name == state.sContentAddressed) {
|
if (i->name == state.sContentAddressed && state.forceBool(*i->value, noPos, context_below)) {
|
||||||
contentAddressed = state.forceBool(*i->value, noPos, context_below);
|
contentAddressed = true;
|
||||||
if (contentAddressed)
|
experimentalFeatureSettings.require(Xp::CaDerivations);
|
||||||
experimentalFeatureSettings.require(Xp::CaDerivations);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (i->name == state.sImpure) {
|
else if (i->name == state.sImpure && state.forceBool(*i->value, noPos, context_below)) {
|
||||||
isImpure = state.forceBool(*i->value, noPos, context_below);
|
isImpure = true;
|
||||||
if (isImpure)
|
experimentalFeatureSettings.require(Xp::ImpureDerivations);
|
||||||
experimentalFeatureSettings.require(Xp::ImpureDerivations);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The `args' attribute is special: it supplies the
|
/* The `args' attribute is special: it supplies the
|
||||||
|
|
Loading…
Reference in a new issue