diff --git a/src/libexpr/eval-settings.cc b/src/libexpr/eval-settings.cc index ebb9e5bbd..b54afdce1 100644 --- a/src/libexpr/eval-settings.cc +++ b/src/libexpr/eval-settings.cc @@ -103,13 +103,4 @@ Path getNixDefExpr() : getHome() + "/.nix-defexpr"; } -void EvalSettings::addPrimOp(PrimOp && primOp) -{ - extraPrimOps.emplace_back(std::move(primOp)); -} -void EvalSettings::addPrimOp(const PrimOp & primOp) -{ - extraPrimOps.emplace_back(PrimOp(primOp)); -} - } // namespace nix \ No newline at end of file diff --git a/src/libexpr/eval-settings.hh b/src/libexpr/eval-settings.hh index 368173b01..d16fd4035 100644 --- a/src/libexpr/eval-settings.hh +++ b/src/libexpr/eval-settings.hh @@ -53,15 +53,6 @@ struct EvalSettings : Config std::vector extraPrimOps; - /** - * Register a primop to be added when an EvalState is created from these settings. - */ - void addPrimOp(PrimOp && primOp); - /** - * Register a primop to be added when an EvalState is created from these settings. - */ - void addPrimOp(const PrimOp & primOp); - Setting enableNativeCode{this, false, "allow-unsafe-native-code-during-evaluation", R"( Enable built-in functions that allow executing native code. diff --git a/src/libflake/flake/settings.cc b/src/libflake/flake/settings.cc index 4ceca38ec..cac7c4384 100644 --- a/src/libflake/flake/settings.cc +++ b/src/libflake/flake/settings.cc @@ -5,11 +5,11 @@ namespace nix::flake { Settings::Settings() {} -void Settings::configureEvalSettings(nix::EvalSettings & evalSettings) +void Settings::configureEvalSettings(nix::EvalSettings & evalSettings) const { - evalSettings.addPrimOp(primops::getFlake(*this)); - evalSettings.addPrimOp(primops::parseFlakeRef); - evalSettings.addPrimOp(primops::flakeRefToString); + evalSettings.extraPrimOps.emplace_back(primops::getFlake(*this)); + evalSettings.extraPrimOps.emplace_back(primops::parseFlakeRef); + evalSettings.extraPrimOps.emplace_back(primops::flakeRefToString); } } // namespace nix diff --git a/src/libflake/flake/settings.hh b/src/libflake/flake/settings.hh index f629f3e74..5f0d9fb21 100644 --- a/src/libflake/flake/settings.hh +++ b/src/libflake/flake/settings.hh @@ -17,7 +17,7 @@ struct Settings : public Config { Settings(); - void configureEvalSettings(nix::EvalSettings & evalSettings); + void configureEvalSettings(nix::EvalSettings & evalSettings) const; Setting useRegistries{ this,