wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 19:01:16 +02:00
Code Activity

Inline inputsRealised

Browse source
This commit is contained in:
John Ericson 2025-02-01 18:37:54 -05:00
parent 4b1753e661
commit b3b741973e
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -382,12 +382,7 @@ Goal::Co DerivationGoal::gaveUpOnSubstitution()
} }
if (!waitees.empty()) co_await Suspend{}; /* to prevent hang (no wake-up event) */ if (!waitees.empty()) co_await Suspend{}; /* to prevent hang (no wake-up event) */
co_return inputsRealised();
}
Goal::Co DerivationGoal::inputsRealised()
{
trace("all inputs realised"); trace("all inputs realised");
if (nrFailed != 0) { if (nrFailed != 0) {

3
src/libstore/build/derivation-goal.hh
View file

@ -80,7 +80,7 @@ struct DerivationGoal : public Goal
/** /**
* Mapping from input derivations + output names to actual store * Mapping from input derivations + output names to actual store
* paths. This is filled in by waiteeDone() as each dependency * paths. This is filled in by waiteeDone() as each dependency
* finishes, before inputsRealised() is reached. * finishes, before `trace("all inputs realised")` is reached.
*/ */
std::map<std::pair<StorePath, std::string>, StorePath> inputDrvOutputs; std::map<std::pair<StorePath, std::string>, StorePath> inputDrvOutputs;
@ -235,7 +235,6 @@ struct DerivationGoal : public Goal
Co init() override; Co init() override;
Co haveDerivation(); Co haveDerivation();
Co gaveUpOnSubstitution(); Co gaveUpOnSubstitution();
Co inputsRealised();
Co tryToBuild(); Co tryToBuild();
virtual Co tryLocalBuild(); virtual Co tryLocalBuild();
Co buildDone(); Co buildDone();