diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-04 12:00:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-08 11:49:24 +0200 |
| commit | 82f903e70f580c34503052245625354d2f097d7e (patch) | |
| tree | bffe5f2fdadc679ed930023886ac8b4e658df70d /build-aux | |
| parent | f6919ebdc6b0ce0286814cc6ab0564b1a4c67f5f (diff) | |
| download | guix-82f903e70f580c34503052245625354d2f097d7e.tar.gz guix-82f903e70f580c34503052245625354d2f097d7e.zip | |
daemon: Remove 'NIX_LIBEXEC_DIR'.
* nix/libstore/globals.hh (Settings)[nixLibexecDir]: Remove.
* nix/libstore/globals.cc (Settings::processEnvironment): Remove
reference to 'nixLibexecDir'.
* nix/local.mk (libstore_a_CPPFLAGS): Remove -DNIX_LIBEXEC_DIR flag.
* build-aux/pre-inst-env.in: Remove references to 'NIX_LIBEXEC_DIR'.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/pre-inst-env.in | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index f96288132d..e0aa7fe868 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -42,12 +42,6 @@ export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH PATH="$abs_top_builddir/scripts:$abs_top_builddir:$PATH" export PATH -# Daemon helpers. - -NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'authenticate', etc. - -export NIX_LIBEXEC_DIR - # The daemon invokes 'guix'; tell it which one to use. GUIX="$abs_top_builddir/scripts/guix" export GUIX |