qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Avoid some pointless copying of drvs

Browse source
This commit is contained in:
John Ericson 2022-03-18 02:15:32 +00:00
parent 8496be7def
commit 049fae155a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/primops.cc
View file

@ -1199,7 +1199,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
// Regular, non-CA derivation should always return a single hash and not // Regular, non-CA derivation should always return a single hash and not
// hash per output. // hash per output.
auto hashModulo = hashDerivationModulo(*state.store, Derivation(drv), true); auto hashModulo = hashDerivationModulo(*state.store, drv, true);
std::visit(overloaded { std::visit(overloaded {
[&](const DrvHash & drvHash) { [&](const DrvHash & drvHash) {
auto & h = drvHash.hash; auto & h = drvHash.hash;
@ -1240,7 +1240,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
However, we don't bother doing this for floating CA derivations because However, we don't bother doing this for floating CA derivations because
their "hash modulo" is indeterminate until built. */ their "hash modulo" is indeterminate until built. */
if (drv.type() != DerivationType::CAFloating) { if (drv.type() != DerivationType::CAFloating) {
auto h = hashDerivationModulo(*state.store, Derivation(drv), false); auto h = hashDerivationModulo(*state.store, drv, false);
drvHashes.lock()->insert_or_assign(drvPath, h); drvHashes.lock()->insert_or_assign(drvPath, h);
} }