mirror of
https://github.com/NixOS/nix.git
synced 2025-11-12 13:36:02 +01:00
Merge pull request #97 from DeterminateSystems/fix-duplicate-builtins
Don't register extra primops twice
This commit is contained in:
commit
ac6318c9c5
1 changed files with 0 additions and 6 deletions
|
|
@ -5028,12 +5028,6 @@ void EvalState::createBaseEnv(const EvalSettings & evalSettings)
|
||||||
addPrimOp(std::move(primOpAdjusted));
|
addPrimOp(std::move(primOpAdjusted));
|
||||||
}
|
}
|
||||||
|
|
||||||
for (auto & primOp : evalSettings.extraPrimOps) {
|
|
||||||
auto primOpAdjusted = primOp;
|
|
||||||
primOpAdjusted.arity = std::max(primOp.args.size(), primOp.arity);
|
|
||||||
addPrimOp(std::move(primOpAdjusted));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Add a wrapper around the derivation primop that computes the
|
/* Add a wrapper around the derivation primop that computes the
|
||||||
`drvPath' and `outPath' attributes lazily.
|
`drvPath' and `outPath' attributes lazily.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue