diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-02-04 14:17:46 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-02-04 16:20:01 +0100 |
| commit | 4d4a38f620520acc787ff5db2be3736923e14235 (patch) | |
| tree | f562db4b438358b74cab73cd471308ed7051dc1e /nix/libstore | |
| parent | 44cfbb6233408255d948c02f6c32cbd43707864e (diff) | |
| download | guix-4d4a38f620520acc787ff5db2be3736923e14235.tar guix-4d4a38f620520acc787ff5db2be3736923e14235.tar.gz | |
daemon: Remove the 'NIX_SUBSTITUTERS' environment variable.
* nix/libstore/globals.cc (Settings:update): Remove changes to
'substituters'.
* nix/nix-daemon/guix-daemon.cc (main): Set 'settings.substituters'
directly instead of changing the 'NIX_SUBSTITUTERS' environment variable.
* build-aux/pre-inst-env.in: Remove reference to 'NIX_SUBSTITUTERS'.
Diffstat (limited to 'nix/libstore')
| -rw-r--r-- | nix/libstore/globals.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc index 130b0937fd..69f6d06563 100644 --- a/nix/libstore/globals.cc +++ b/nix/libstore/globals.cc @@ -141,18 +141,6 @@ void Settings::update() _get(gcKeepDerivations, "gc-keep-derivations"); _get(autoOptimiseStore, "auto-optimise-store"); _get(envKeepDerivations, "env-keep-derivations"); - - string subs = getEnv("NIX_SUBSTITUTERS", "default"); - if (subs == "default") { - substituters.clear(); -#if 0 - if (getEnv("NIX_OTHER_STORES") != "") - substituters.push_back(nixLibexecDir + "/nix/substituters/copy-from-other-stores.pl"); -#endif - substituters.push_back(nixLibexecDir + "/nix/substituters/download-using-manifests.pl"); - substituters.push_back(nixLibexecDir + "/nix/substituters/download-from-binary-cache.pl"); - } else - substituters = tokenizeString<Strings>(subs, ":"); } |