diff --git a/src/libstore/build/derivation-building-goal.cc b/src/libstore/build/derivation-building-goal.cc index a82f7f928..24a53c27b 100644 --- a/src/libstore/build/derivation-building-goal.cc +++ b/src/libstore/build/derivation-building-goal.cc @@ -758,16 +758,16 @@ Goal::Co DerivationBuildingGoal::tryToBuild() *localStoreP, std::make_unique(*this, builder), DerivationBuilderParams{ - drvPath, - buildMode, - buildResult, - *drv, - *drvOptions, - inputPaths, - initialOutputs, - std::move(defaultPathsInChroot), - std::move(finalEnv), - std::move(extraFiles), + .drvPath = drvPath, + .buildResult = buildResult, + .drv = *drv, + .drvOptions = *drvOptions, + .inputPaths = inputPaths, + .initialOutputs = initialOutputs, + .buildMode = buildMode, + .defaultPathsInChroot = std::move(defaultPathsInChroot), + .finalEnv = std::move(finalEnv), + .extraFiles = std::move(extraFiles), }); } diff --git a/src/libstore/include/nix/store/build/derivation-builder.hh b/src/libstore/include/nix/store/build/derivation-builder.hh index 144ca27b1..48ad06e17 100644 --- a/src/libstore/include/nix/store/build/derivation-builder.hh +++ b/src/libstore/include/nix/store/build/derivation-builder.hh @@ -93,32 +93,6 @@ struct DerivationBuilderParams * `EnvEntry::nameOfPassAsFile` above. */ StringMap extraFiles; - - DerivationBuilderParams( - const StorePath & drvPath, - const BuildMode & buildMode, - BuildResult & buildResult, - const Derivation & drv, - const DerivationOptions & drvOptions, - const StorePathSet & inputPaths, - std::map & initialOutputs, - PathsInChroot defaultPathsInChroot, - std::map> finalEnv, - StringMap extraFiles) - : drvPath{drvPath} - , buildResult{buildResult} - , drv{drv} - , drvOptions{drvOptions} - , inputPaths{inputPaths} - , initialOutputs{initialOutputs} - , buildMode{buildMode} - , defaultPathsInChroot{std::move(defaultPathsInChroot)} - , finalEnv{std::move(finalEnv)} - , extraFiles{std::move(extraFiles)} - { - } - - DerivationBuilderParams(DerivationBuilderParams &&) = default; }; /**