nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-11 11:31:03 +01:00
Code Activity

Fix #13293

Browse source 
We move the `assertPathValidity` to where we know what the wanted
outputs are.
This commit is contained in:
John Ericson 2025-05-28 20:37:23 -04:00
parent f42eaf2c8e
commit 5267718472
4 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/build/derivation-building-goal.cc
View file

@ -613,9 +613,6 @@ Goal::Co DerivationBuildingGoal::tryToBuild()
void closeLogFile() override {
goal.closeLogFile();
}
SingleDrvOutputs assertPathValidity() override {
return goal.assertPathValidity();
}
void appendLogTailErrorMsg(std::string & msg) override {
goal.appendLogTailErrorMsg(msg);
}

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

@ -210,6 +210,13 @@ Goal::Co DerivationGoal::haveDerivation(StorePath drvPath)
.outputs = wantedOutputs,
});
if (buildMode == bmCheck) {
/* In checking mode, the builder will not register any outputs.
So we want to make sure the ones that we wanted to check are
properly there. */
buildResult.builtOutputs = assertPathValidity(drvPath);
}
co_return amDone(g->exitCode, g->ex);
};