lix-project/lix
20
58
Fork 31
Code Issues 354 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Make derivation primop code for fixed output more concise

Browse source
This commit is contained in:
John Ericson 2023-01-06 12:52:16 -05:00
parent 848b0832b5
commit 7e1cfa97c6
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libexpr/primops.cc
View file

@ -1248,16 +1248,14 @@ static void prim_derivationStrict(EvalState & state, const PosIdx pos, Value * *
auto h = newHashAllowEmpty(*outputHash, parseHashTypeOpt(outputHashAlgo)); auto h = newHashAllowEmpty(*outputHash, parseHashTypeOpt(outputHashAlgo));
auto method = ingestionMethod.value_or(FileIngestionMethod::Flat); auto method = ingestionMethod.value_or(FileIngestionMethod::Flat);
// FIXME non-trivial fixed refs set
auto ca = contentAddressFromMethodHashAndRefs(
method,
std::move(h),
{});
DerivationOutput::CAFixed dof { .ca = ca }; DerivationOutput::CAFixed dof {
// FIXME non-trivial fixed refs set
.ca = contentAddressFromMethodHashAndRefs(method, std::move(h), {}),
};
drv.env["out"] = state.store->printStorePath(dof.path(*state.store, drvName, "out")); drv.env["out"] = state.store->printStorePath(dof.path(*state.store, drvName, "out"));
drv.outputs.insert_or_assign("out", dof); drv.outputs.insert_or_assign("out", std::move(dof));
} }
else if (contentAddressed || isImpure) { else if (contentAddressed || isImpure) {