From 959eaa1eb834fd47ceab3c5bbbe4967e808d530b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 4 Feb 2019 16:14:09 +0100 Subject: daemon: Add "/guix" to default 'nixLibexecDir'. This makes it easier to run the uninstalled daemon. * nix/local.mk (libstore_a_CPPFLAGS): Append "/guix" to NIX_LIBEXEC_DIR. * build-aux/pre-inst-env.in (NIX_LIBEXEC_DIR): Adjust comment. * nix/libstore/builtins.cc (builtinDownload): Remove SUBDIR and its use. * nix/libstore/local-store.cc (runAuthenticationProgram): Ditto. * nix/libstore/gc.cc (addAdditionalRoots): Remove "/guix" prefix. * nix/nix-daemon/guix-daemon.cc (main): Ditto. --- nix/nix-daemon/guix-daemon.cc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'nix/nix-daemon') diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc index 23ef46ef8c..f47d142612 100644 --- a/nix/nix-daemon/guix-daemon.cc +++ b/nix/nix-daemon/guix-daemon.cc @@ -480,7 +480,7 @@ main (int argc, char *argv[]) { std::string build_hook; - build_hook = settings.nixLibexecDir + "/guix/offload"; + build_hook = settings.nixLibexecDir + "/offload"; setenv ("NIX_BUILD_HOOK", build_hook.c_str (), 1); } #else @@ -498,16 +498,8 @@ main (int argc, char *argv[]) format ("build log compression: %1%") % settings.logCompression); if (settings.useSubstitutes) - { - /* XXX: Hack our way to use the 'substitute' script from - 'LIBEXECDIR/guix' or just 'LIBEXECDIR', depending on whether - we're running uninstalled or not. */ - const string subdir = getenv("GUIX_UNINSTALLED") != NULL - ? "" : "/guix"; - - settings.substituters.push_back (settings.nixLibexecDir - + subdir + "/substitute"); - } + 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. */ -- cgit v1.2.3