From ecdcba27c54ccb620746c89409d99d7346f1d9bd Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 26 Feb 2025 11:27:04 -0500 Subject: [PATCH] Remove unused parameter to the goal constructor It has been unused since 37fca662b0acef3c104a159709a394832e297dda. --- src/libstore/build/derivation-goal.cc | 4 ++-- src/libstore/build/drv-output-substitution-goal.cc | 2 +- src/libstore/build/goal.hh | 2 +- src/libstore/build/substitution-goal.cc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index e88f6bda7..907d7f8eb 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -38,7 +38,7 @@ namespace nix { DerivationGoal::DerivationGoal(const StorePath & drvPath, const OutputsSpec & wantedOutputs, Worker & worker, BuildMode buildMode) - : Goal(worker, DerivedPath::Built { .drvPath = makeConstantStorePathRef(drvPath), .outputs = wantedOutputs }) + : Goal(worker) , useDerivation(true) , drvPath(drvPath) , wantedOutputs(wantedOutputs) @@ -56,7 +56,7 @@ DerivationGoal::DerivationGoal(const StorePath & drvPath, DerivationGoal::DerivationGoal(const StorePath & drvPath, const BasicDerivation & drv, const OutputsSpec & wantedOutputs, Worker & worker, BuildMode buildMode) - : Goal(worker, DerivedPath::Built { .drvPath = makeConstantStorePathRef(drvPath), .outputs = wantedOutputs }) + : Goal(worker) , useDerivation(false) , drvPath(drvPath) , wantedOutputs(wantedOutputs) diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/src/libstore/build/drv-output-substitution-goal.cc index f069c0d94..c39793a65 100644 --- a/src/libstore/build/drv-output-substitution-goal.cc +++ b/src/libstore/build/drv-output-substitution-goal.cc @@ -11,7 +11,7 @@ DrvOutputSubstitutionGoal::DrvOutputSubstitutionGoal( Worker & worker, RepairFlag repair, std::optional ca) - : Goal(worker, DerivedPath::Opaque { StorePath::dummy }) + : Goal(worker) , id(id) { name = fmt("substitution of '%s'", id.to_string()); diff --git a/src/libstore/build/goal.hh b/src/libstore/build/goal.hh index 95572ef02..9893c6108 100644 --- a/src/libstore/build/goal.hh +++ b/src/libstore/build/goal.hh @@ -378,7 +378,7 @@ public: */ std::optional ex; - Goal(Worker & worker, DerivedPath path) + Goal(Worker & worker) : worker(worker), top_co(init_wrapper()) { // top_co shouldn't have a goal already, should be nullptr. diff --git a/src/libstore/build/substitution-goal.cc b/src/libstore/build/substitution-goal.cc index 983c86601..245fc983f 100644 --- a/src/libstore/build/substitution-goal.cc +++ b/src/libstore/build/substitution-goal.cc @@ -8,7 +8,7 @@ namespace nix { PathSubstitutionGoal::PathSubstitutionGoal(const StorePath & storePath, Worker & worker, RepairFlag repair, std::optional ca) - : Goal(worker, DerivedPath::Opaque { storePath }) + : Goal(worker) , storePath(storePath) , repair(repair) , ca(ca)