diff options
author | eldritch horrors <pennae@lix.systems> | 2024-08-25 13:41:56 +0200 |
---|---|---|
committer | eldritch horrors <pennae@lix.systems> | 2024-08-25 20:40:19 +0000 |
commit | 30a87b4cd5830c6205055ddba5743c69004e37df (patch) | |
tree | 8efa7389c992338366c35593f99459184e2fbb4d /src | |
parent | 72f91767a898e0e918ae377193b58c19a97eec56 (diff) |
libstore: remove unused Goal ctor parameter
Change-Id: I9345fe272d6df5bd592621ce2da369fc1cd36d6d
Diffstat (limited to 'src')
-rw-r--r-- | src/libstore/build/derivation-goal.cc | 4 | ||||
-rw-r--r-- | src/libstore/build/drv-output-substitution-goal.cc | 2 | ||||
-rw-r--r-- | src/libstore/build/goal.hh | 2 | ||||
-rw-r--r-- | 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 0f082b193..2638d7395 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -58,7 +58,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) @@ -76,7 +76,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 2032478d1..e6c7524e9 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<ContentAddress> ca) - : Goal(worker, DerivedPath::Opaque { StorePath::dummy }) + : Goal(worker) , id(id) { state = &DrvOutputSubstitutionGoal::init; diff --git a/src/libstore/build/goal.hh b/src/libstore/build/goal.hh index 9a089d091..4ff4a14f8 100644 --- a/src/libstore/build/goal.hh +++ b/src/libstore/build/goal.hh @@ -143,7 +143,7 @@ public: */ std::unique_ptr<Error> ex; - Goal(Worker & worker, DerivedPath path) + explicit Goal(Worker & worker) : worker(worker) { } diff --git a/src/libstore/build/substitution-goal.cc b/src/libstore/build/substitution-goal.cc index d013d1c78..d84b65a53 100644 --- a/src/libstore/build/substitution-goal.cc +++ b/src/libstore/build/substitution-goal.cc @@ -7,7 +7,7 @@ namespace nix { PathSubstitutionGoal::PathSubstitutionGoal(const StorePath & storePath, Worker & worker, RepairFlag repair, std::optional<ContentAddress> ca) - : Goal(worker, DerivedPath::Opaque { storePath }) + : Goal(worker) , storePath(storePath) , repair(repair) , ca(ca) |