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

DerivationBuildingGoal::started make local (lambda) variable

Browse source
This commit is contained in:
John Ericson 2025-08-29 15:10:56 -04:00
parent 3b9c510ab1
commit c6ba120000
2 changed files with 28 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -439,8 +439,9 @@ Goal::Co DerivationBuildingGoal::gaveUpOnSubstitution()
co_return tryToBuild(); co_return tryToBuild();
} }
void DerivationBuildingGoal::started() Goal::Co DerivationBuildingGoal::tryToBuild()
{ {
auto started = [&]() {
auto msg = auto msg =
fmt(buildMode == bmRepair ? "repairing outputs of '%s'" fmt(buildMode == bmRepair ? "repairing outputs of '%s'"
: buildMode == bmCheck ? "checking outputs of '%s'" : buildMode == bmCheck ? "checking outputs of '%s'"
@ -466,10 +467,8 @@ void DerivationBuildingGoal::started()
1}); 1});
mcRunningBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.runningBuilds); mcRunningBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.runningBuilds);
worker.updateProgress(); worker.updateProgress();
} };
Goal::Co DerivationBuildingGoal::tryToBuild()
{
/** /**
* Activity that denotes waiting for a lock. * Activity that denotes waiting for a lock.
*/ */

2
src/libstore/include/nix/store/build/derivation-building-goal.hh
View file

@ -158,8 +158,6 @@ struct DerivationBuildingGoal : public Goal
*/ */
void killChild(); void killChild();
void started();
Done doneSuccess(BuildResult::Status status, SingleDrvOutputs builtOutputs); Done doneSuccess(BuildResult::Status status, SingleDrvOutputs builtOutputs);
Done doneFailure(BuildError ex); Done doneFailure(BuildError ex);