aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-04-18 22:22:30 +0200
committerLudovic Courtès <ludo@gnu.org>2013-04-18 22:50:31 +0200
commitea0ee755bd54db2c3766714946c24df4e9b94fc0 (patch)
treef67c474356ef4373731749431e19aa8ae4b6ffdc /nix
parent48febeb81a06f95f2af98e153868e6d29a4ba353 (diff)
downloadguix-ea0ee755bd54db2c3766714946c24df4e9b94fc0.tar.gz
guix-ea0ee755bd54db2c3766714946c24df4e9b94fc0.zip
daemon: Really enable the substituter by default.
* nix/nix-daemon/guix-daemon.cc (main): Really enable the substituter by default. Reported by Mark H. Weaver.
Diffstat (limited to 'nix')
-rw-r--r--nix/nix-daemon/guix-daemon.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc
index 0e2f36150b..0f21e4f99e 100644
--- a/nix/nix-daemon/guix-daemon.cc
+++ b/nix/nix-daemon/guix-daemon.cc
@@ -204,10 +204,8 @@ main (int argc, char *argv[])
settings.substituters.clear ();
string subs = getEnv ("NIX_SUBSTITUTERS", "default");
if (subs == "default")
- /* XXX: No substituters until we have something that works. */
- settings.substituters.clear ();
- // settings.substituters.push_back (settings.nixLibexecDir
- // + "/guix/substitute-binary");
+ settings.substituters.push_back (settings.nixLibexecDir
+ + "/guix/substitute-binary");
else
settings.substituters = tokenizeString<Strings> (subs, ":");