diff options
| author | David Craven <david@craven.ch> | 2016-06-23 19:44:38 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-26 23:11:07 +0200 |
| commit | 9dd674db017dbdc451cfd35da2dc3ce08db0726a (patch) | |
| tree | fdab5b2f68ea609b90c80606466ad7702f3f8dbc /gnu | |
| parent | 8ac6282c4b97ece43b922a8c1a99a0a8e753c765 (diff) | |
| download | gnu-guix-9dd674db017dbdc451cfd35da2dc3ce08db0726a.tar gnu-guix-9dd674db017dbdc451cfd35da2dc3ce08db0726a.tar.gz | |
daemon: Rename 'NIX_CONF_DIR' to 'GUIX_CONFIGURATION_DIRECTORY'.
Partly fixes <http://bugs.gnu.org/22459>.
Reported by Jeff Mickey <j@codemac.net> and David Craven <david@craven.ch>.
* nix/libstore/globals.cc (Settings::processEnvironment()): Change
'NIX_CONF_DIR' to 'GUIX_CONFIGURATION_DIRECTORY'.
* nix/local.mk (libstore_a_CPPFLAGS): Likewise.
* guix/config.scm.in (%config-directory): Likewise.
* build-aux/test-env.in: Likewise.
* gnu/packages/patches/hydra-automake-1.15.patch: Likewise.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/patches/hydra-automake-1.15.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/patches/hydra-automake-1.15.patch b/gnu/packages/patches/hydra-automake-1.15.patch index 0d8fa98519..91c7b9202b 100644 --- a/gnu/packages/patches/hydra-automake-1.15.patch +++ b/gnu/packages/patches/hydra-automake-1.15.patch @@ -23,7 +23,7 @@ Automake's parallel test harness. - HYDRA_HOME="$(top_srcdir)/src" \ - HYDRA_CONFIG= \ - NIX_REMOTE= \ -- NIX_CONF_DIR="$(abs_builddir)/nix/etc/nix" \ +- GUIX_CONFIGURATION_DIRECTORY="$(abs_builddir)/nix/etc/nix" \ - NIX_STATE_DIR="$(abs_builddir)/nix/var/nix" \ - NIX_MANIFESTS_DIR="$(abs_builddir)/nix/var/nix/manifests" \ - NIX_STORE_DIR="$(abs_builddir)/nix/store" \ @@ -39,7 +39,7 @@ Automake's parallel test harness. + HYDRA_HOME="$(top_srcdir)/src"; export HYDRA_HOME; \ + HYDRA_CONFIG=; export HYDRA_CONFIG; \ + NIX_REMOTE=; export NIX_REMOTE; \ -+ NIX_CONF_DIR="$(abs_builddir)/nix/etc/nix"; export NIX_CONF_DIR; \ ++ GUIX_CONFIGURATION_DIRECTORY="$(abs_builddir)/nix/etc/nix"; export GUIX_CONFIGURATION_DIRECTORY; \ + NIX_STATE_DIR="$(abs_builddir)/nix/var/nix"; export NIX_STATE_DIR; \ + NIX_MANIFESTS_DIR="$(abs_builddir)/nix/var/nix/manifests"; export NIX_MANIFESTS_DIR; \ + NIX_STORE_DIR="$(abs_builddir)/nix/store"; export NIX_STORE_DIR; \ |