nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-13 20:41:04 +01:00
Code Activity

Remove unused parameters to DrvOutputSubstitutionGoal

Browse source
This commit is contained in:
John Ericson 2025-10-14 18:53:03 -04:00
parent b20cebf993
commit 46357468a4
5 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -100,8 +100,7 @@ Goal::Co DerivationGoal::haveDerivation(bool storeDerivation)
them. */
if (settings.useSubstitutes && drvOptions.substitutesAllowed()) {
if (!checkResult)
waitees.insert(upcast_goal(worker.makeDrvOutputSubstitutionGoal(
DrvOutput{outputHash, wantedOutput}, buildMode == bmRepair ? Repair : NoRepair)));
waitees.insert(upcast_goal(worker.makeDrvOutputSubstitutionGoal(DrvOutput{outputHash, wantedOutput})));
else {
auto * cap = getDerivationCA(*drv);
waitees.insert(upcast_goal(worker.makePathSubstitutionGoal(

3
src/libstore/build/drv-output-substitution-goal.cc
View file

@ -8,8 +8,7 @@
namespace nix {
DrvOutputSubstitutionGoal::DrvOutputSubstitutionGoal(
const DrvOutput & id, Worker & worker, RepairFlag repair, std::optional<ContentAddress> ca)
DrvOutputSubstitutionGoal::DrvOutputSubstitutionGoal(const DrvOutput & id, Worker & worker)
: Goal(worker, init())
, id(id)
{

5
src/libstore/build/worker.cc
View file

@ -104,10 +104,9 @@ Worker::makePathSubstitutionGoal(const StorePath & path, RepairFlag repair, std:
return initGoalIfNeeded(substitutionGoals[path], path, *this, repair, ca);
}
std::shared_ptr<DrvOutputSubstitutionGoal>
Worker::makeDrvOutputSubstitutionGoal(const DrvOutput & id, RepairFlag repair, std::optional<ContentAddress> ca)
std::shared_ptr<DrvOutputSubstitutionGoal> Worker::makeDrvOutputSubstitutionGoal(const DrvOutput & id)
{
return initGoalIfNeeded(drvOutputSubstitutionGoals[id], id, *this, repair, ca);
return initGoalIfNeeded(drvOutputSubstitutionGoals[id], id, *this);
}
GoalPtr Worker::makeGoal(const DerivedPath & req, BuildMode buildMode)