diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-01-26 15:53:34 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-01-26 15:53:56 +0100 |
| commit | 70d1ce9afcd7454fc749cbfe0e0851d3e3e0312b (patch) | |
| tree | 6a77ea9e76438fb2b40ddf9114c8be74ca8ab944 | |
| parent | 566146abba4626bc02816118dd80bae68b8497d5 (diff) | |
| download | guix-70d1ce9afcd7454fc749cbfe0e0851d3e3e0312b.tar guix-70d1ce9afcd7454fc749cbfe0e0851d3e3e0312b.tar.gz | |
build: Set 'NIX_LIBEXEC_DIR' in 'pre-inst-env'.
Reported by Nikita Karetnikov <nikita@karetnikov.org>.
* test-env.in: Move 'NIX_LIBEXEC_DIR' setting to...
* pre-inst-env.in: ... here.
| -rw-r--r-- | pre-inst-env.in | 5 | ||||
| -rw-r--r-- | test-env.in | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pre-inst-env.in b/pre-inst-env.in index e90e1b0ac4..cd4ee01497 100644 --- a/pre-inst-env.in +++ b/pre-inst-env.in @@ -45,7 +45,10 @@ NIX_ROOT_FINDER="$abs_top_builddir/nix/scripts/list-runtime-roots" NIX_SUBSTITUTERS="$abs_top_builddir/nix/scripts/substitute-binary" NIX_SETUID_HELPER="$abs_top_builddir/nix-setuid-helper" NIX_BUILD_HOOK="$abs_top_builddir/nix/scripts/offload" -export NIX_ROOT_FINDER NIX_SETUID_HELPER NIX_SUBSTITUTERS NIX_BUILD_HOOK +NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'guix-authenticate' + +export NIX_ROOT_FINDER NIX_SETUID_HELPER NIX_SUBSTITUTERS \ + NIX_BUILD_HOOK NIX_LIBEXEC_DIR # The 'guix-register' program. GUIX_REGISTER="$abs_top_builddir/guix-register" diff --git a/test-env.in b/test-env.in index df73ecdc7a..9b5817f4ee 100644 --- a/test-env.in +++ b/test-env.in @@ -1,7 +1,7 @@ #!/bin/sh # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -53,9 +53,6 @@ then chmod 400 "$NIX_CONF_DIR/signing-key.sec" fi - # For 'guix-authenticate'. - NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" - # A place to store data of the substituter. GUIX_BINARY_SUBSTITUTE_URL="file://$NIX_STATE_DIR/substituter-data" rm -rf "$NIX_STATE_DIR/substituter-data" @@ -67,7 +64,7 @@ then export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR \ NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR \ NIX_ROOT_FINDER NIX_SETUID_HELPER GUIX_BINARY_SUBSTITUTE_URL \ - NIX_CONF_DIR NIX_LIBEXEC_DIR XDG_CACHE_HOME + NIX_CONF_DIR XDG_CACHE_HOME # Do that because store.scm calls `canonicalize-path' on it. mkdir -p "$NIX_STORE_DIR" |