diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-02-04 16:14:09 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-02-04 16:20:01 +0100 |
| commit | 959eaa1eb834fd47ceab3c5bbbe4967e808d530b (patch) | |
| tree | 11af589b50530f3cdd09c895077a203e332464b9 /build-aux | |
| parent | 4d4a38f620520acc787ff5db2be3736923e14235 (diff) | |
| download | gnu-guix-959eaa1eb834fd47ceab3c5bbbe4967e808d530b.tar gnu-guix-959eaa1eb834fd47ceab3c5bbbe4967e808d530b.tar.gz | |
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.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/pre-inst-env.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index 050b1b8007..3efab69e7d 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -45,7 +45,7 @@ export PATH # Daemon helpers. NIX_ROOT_FINDER="$abs_top_builddir/nix/scripts/list-runtime-roots" -NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'guix-authenticate' +NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'authenticate', etc. export NIX_ROOT_FINDER NIX_LIBEXEC_DIR |