From 8bc591a6f07ee577b5aa594dfa705f3ddabd269d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 18 Jul 2008 13:05:10 +0000 Subject: * Use the copy-from-other-stores substituter by default. Of course, it only does something if $NIX_OTHER_STORES (not really a good name...) is set. * Do globbing on the elements of $NIX_OTHER_STORES. E.g. you could set it to /mnts/*/nix or something. * Install substituters in libexec/nix/substituters. --- src/libmain/shared.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index d6f299d6bfda..36b4ebdc9c7a 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -111,9 +111,10 @@ static void initAndRun(int argc, char * * argv) nixBinDir = canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR)); string subs = getEnv("NIX_SUBSTITUTERS", "default"); - if (subs == "default") - substituters.push_back(nixLibexecDir + "/nix/download-using-manifests.pl"); - else + if (subs == "default") { + substituters.push_back(nixLibexecDir + "/nix/substituters/copy-from-other-stores.pl"); + substituters.push_back(nixLibexecDir + "/nix/substituters/download-using-manifests.pl"); + } else substituters = tokenizeString(subs, ":"); /* Get some settings from the configuration file. */ -- cgit 1.4.1