From 82f903e70f580c34503052245625354d2f097d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 4 Sep 2019 12:00:31 +0200 Subject: 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'. --- build-aux/pre-inst-env.in | 6 ------ 1 file changed, 6 deletions(-) (limited to 'build-aux') 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 -- cgit v1.2.3