From c05bdef020d99da1204629bba7b775553c5d6005 Mon Sep 17 00:00:00 2001 From: regnat Date: Thu, 15 Jul 2021 18:17:18 +0200 Subject: Forward the whole Nix config to the repl subprocesses Fill `NIX_CONFIG` with the value of the current Nix configuration before calling the nix subprocesses in the repl That way the whole configuration (including the possible `experimental-features`, a possibly `--store` option or whatever) will be made available. This is required for example to make `nix repl` work with a custom `--store` --- src/nix/repl.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src') diff --git a/src/nix/repl.cc b/src/nix/repl.cc index 0275feae7..bf3b2c401 100644 --- a/src/nix/repl.cc +++ b/src/nix/repl.cc @@ -107,11 +107,8 @@ NixRepl::~NixRepl() string runNix(Path program, const Strings & args, const std::optional & input = {}) { - auto experimentalFeatures = concatStringsSep(" ", settings.experimentalFeatures.get()); - auto nixConf = getEnv("NIX_CONFIG").value_or(""); - nixConf.append("\nexperimental-features = " + experimentalFeatures); auto subprocessEnv = getEnv(); - subprocessEnv["NIX_CONFIG"] = nixConf; + subprocessEnv["NIX_CONFIG"] = globalConfig.toKeyValue(); RunOptions opts(settings.nixBinDir+ "/" + program, args); opts.input = input; opts.environment = subprocessEnv; -- cgit v1.2.3