diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-07-18 13:05:10 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-07-18 13:05:10 +0000 |
| commit | 8bc591a6f07ee577b5aa594dfa705f3ddabd269d (patch) | |
| tree | 674f4cfa3ee0c43d38881a16f729bd863f2f3b17 /src/libmain/shared.cc | |
| parent | 15f39aba8ceb2dabc4f019bd1c985ca9d13bfdb4 (diff) | |
| download | guix-8bc591a6f07ee577b5aa594dfa705f3ddabd269d.tar.gz | |
* 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.
Diffstat (limited to 'src/libmain/shared.cc')
| -rw-r--r-- | src/libmain/shared.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index d6f299d6bf..36b4ebdc9c 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. */ |