diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-29T11·57+0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-29T11·57+0200 |
commit | aa3bc3d5dcff5ff6567a4e00320cb9caa28c5a93 (patch) | |
tree | ca430fbdbfad473105b78384eb200dcce797fd0e /src/libstore/globals.cc | |
parent | 21e9d183ccf4216a61e0bb89d7e2eb42ce092e85 (diff) |
Eliminate the substituter mechanism
Substitution is now simply a Store -> Store copy operation, most typically from BinaryCacheStore to LocalStore.
Diffstat (limited to 'src/libstore/globals.cc')
-rw-r--r-- | src/libstore/globals.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 90539ea85420..c12178e4028a 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -184,19 +184,6 @@ void Settings::update() _get(enableImportNative, "allow-unsafe-native-code-during-evaluation"); _get(useCaseHack, "use-case-hack"); _get(preBuildHook, "pre-build-hook"); - - 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-from-binary-cache.pl"); - if (useSshSubstituter && !sshSubstituterHosts.empty()) - substituters.push_back(nixLibexecDir + "/nix/substituters/download-via-ssh"); - } else - substituters = tokenizeString<Strings>(subs, ":"); } |