nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 23:42:43 +01:00
Code Activity

Simplify DerivationGoal loop -> if

Browse source 
More taking advantage of single wanted output. Also `auto *` not `auto`
for easy reading.
This commit is contained in:
John Ericson 2025-08-13 22:25:41 -04:00
parent 1a6f92837a
commit 2600391147
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libstore/build/derivation-goal.cc
View file

@ -126,23 +126,18 @@ Goal::Co DerivationGoal::haveDerivation()
experimentalFeatureSettings.require(Xp::ImpureDerivations);
auto outputHashes = staticOutputHashes(worker.evalStore, *drv);
for (auto & [outputName, outputHash] : outputHashes) {
if (outputName != wantedOutput)
continue;
this->outputHash = outputHash;
if (auto * mOutputHash = get(outputHashes, wantedOutput)) {
outputHash = *mOutputHash;
/* TODO we might want to also allow randomizing the paths
for regular CA derivations, e.g. for sake of checking
determinism. */
if (impure) {
outputKnown = InitialOutputStatus{
.path = StorePath::random(outputPathName(drv->name, outputName)),
.path = StorePath::random(outputPathName(drv->name, wantedOutput)),
.status = PathStatus::Absent,
};
}
break;
}
if (impure) {
@ -247,7 +242,7 @@ Goal::Co DerivationGoal::repairClosure()
}();
StorePathSet outputClosure;
if (auto mPath = get(outputs, wantedOutput)) {
if (auto * mPath = get(outputs, wantedOutput)) {
worker.store.computeFSClosure(*mPath, outputClosure);
}