diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-02-04 14:17:46 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-02-04 16:20:01 +0100 |
| commit | 4d4a38f620520acc787ff5db2be3736923e14235 (patch) | |
| tree | f562db4b438358b74cab73cd471308ed7051dc1e /build-aux | |
| parent | 44cfbb6233408255d948c02f6c32cbd43707864e (diff) | |
| download | patches-4d4a38f620520acc787ff5db2be3736923e14235.tar patches-4d4a38f620520acc787ff5db2be3736923e14235.tar.gz | |
daemon: Remove the 'NIX_SUBSTITUTERS' environment variable.
* nix/libstore/globals.cc (Settings:update): Remove changes to
'substituters'.
* nix/nix-daemon/guix-daemon.cc (main): Set 'settings.substituters'
directly instead of changing the 'NIX_SUBSTITUTERS' environment variable.
* build-aux/pre-inst-env.in: Remove reference to 'NIX_SUBSTITUTERS'.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/pre-inst-env.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index 286a81591c..050b1b8007 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -1,7 +1,7 @@ #!/bin/sh # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> # Copyright © 2017 Eric Bavier <bavier@cray.com> # # This file is part of GNU Guix. @@ -45,10 +45,9 @@ export PATH # Daemon helpers. NIX_ROOT_FINDER="$abs_top_builddir/nix/scripts/list-runtime-roots" -NIX_SUBSTITUTERS="$abs_top_builddir/nix/scripts/substitute" NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'guix-authenticate' -export NIX_ROOT_FINDER NIX_SUBSTITUTERS NIX_LIBEXEC_DIR +export NIX_ROOT_FINDER NIX_LIBEXEC_DIR NIX_BUILD_HOOK="$abs_top_builddir/nix/scripts/offload" @BUILD_DAEMON_OFFLOAD_TRUE@export NIX_BUILD_HOOK |