diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 16:17:20 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 16:27:15 +0200 |
commit | 9ff87bb99614923fa3336ab4bbf22e3444709b48 (patch) | |
tree | fa169a6cc0fdc8d92bb4c4a4f265afc2ba29a890 /nix/nix-daemon/guix-daemon.cc | |
parent | ae71bef532d6b1c9d1481a3ac65827f148b1e45b (diff) | |
parent | 9e8e252026f558933bdd9cfc26a75d13954b3e8e (diff) | |
download | patches-9ff87bb99614923fa3336ab4bbf22e3444709b48.tar patches-9ff87bb99614923fa3336ab4bbf22e3444709b48.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix/nix-daemon/guix-daemon.cc')
-rw-r--r-- | nix/nix-daemon/guix-daemon.cc | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc index f47d142612..6f9c404c8d 100644 --- a/nix/nix-daemon/guix-daemon.cc +++ b/nix/nix-daemon/guix-daemon.cc @@ -466,23 +466,15 @@ main (int argc, char *argv[]) { settings.processEnvironment (); - /* Use our substituter by default. */ - settings.substituters.clear (); + /* Enable substitutes by default. */ settings.set ("build-use-substitutes", "true"); /* Use our substitute server by default. */ settings.set ("substitute-urls", GUIX_SUBSTITUTE_URLS); #ifdef HAVE_DAEMON_OFFLOAD_HOOK - /* Use our build hook for distributed builds by default. */ + /* Use 'guix offload' for distributed builds by default. */ settings.useBuildHook = true; - if (getenv ("NIX_BUILD_HOOK") == NULL) - { - std::string build_hook; - - build_hook = settings.nixLibexecDir + "/offload"; - setenv ("NIX_BUILD_HOOK", build_hook.c_str (), 1); - } #else /* We are not installing any build hook, so disable it. */ settings.useBuildHook = false; @@ -497,14 +489,6 @@ main (int argc, char *argv[]) printMsg(lvlDebug, format ("build log compression: %1%") % settings.logCompression); - if (settings.useSubstitutes) - settings.substituters.push_back (settings.nixLibexecDir - + "/substitute"); - else - /* Clear the substituter list to make sure nothing ever gets - substituted, regardless of the client's settings. */ - settings.substituters.clear (); - if (geteuid () == 0 && settings.buildUsersGroup.empty ()) fprintf (stderr, _("warning: daemon is running as root, so \ using `--build-users-group' is highly recommended\n")); |