diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-03 22:11:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-08 11:49:24 +0200 |
| commit | bc69ea2d605810cc32e13ed03d5848b8dc358b61 (patch) | |
| tree | c4cbe1017a77ff853255d41b44301ff68c5257a1 /build-aux/pre-inst-env.in | |
| parent | 9fcc35c51fd579b3bb7b4f61cba6973675c3922c (diff) | |
| download | patches-bc69ea2d605810cc32e13ed03d5848b8dc358b61.tar patches-bc69ea2d605810cc32e13ed03d5848b8dc358b61.tar.gz | |
daemon: Run 'guix offload' directly.
* nix/scripts/offload.in: Remove.
* nix/local.mk (nodist_pkglibexec_SCRIPTS) [BUILD_DAEMON_OFFLOAD]:
Remove 'scripts/offload'.
* config-daemon.ac: Don't output 'nix/scripts/offload'.
* build-aux/pre-inst-env.in: Don't set 'NIX_BUILD_HOOK'.
* nix/libstore/build.cc (HookInstance::HookInstance): Run 'guix
offload'.
(DerivationGoal::tryBuildHook): Remove reference to 'NIX_BUILD_HOOK'.
* nix/nix-daemon/guix-daemon.cc (main) [HAVE_DAEMON_OFFLOAD_HOOK]: Don't
set 'NIX_BUILD_HOOK'.
* nix/nix-daemon/nix-daemon.cc (performOp) [!HAVE_DAEMON_OFFLOAD_HOOK]:
Leave 'settings.useBuildHook' unchanged.
Diffstat (limited to 'build-aux/pre-inst-env.in')
| -rw-r--r-- | build-aux/pre-inst-env.in | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index ab1c519d70..f96288132d 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -48,10 +48,6 @@ NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'authenticate', etc. export NIX_LIBEXEC_DIR -NIX_BUILD_HOOK="$abs_top_builddir/nix/scripts/offload" -@BUILD_DAEMON_OFFLOAD_TRUE@export NIX_BUILD_HOOK -@BUILD_DAEMON_OFFLOAD_FALSE@# No offloading support. -@BUILD_DAEMON_OFFLOAD_FALSE@unset NIX_BUILD_HOOK # The daemon invokes 'guix'; tell it which one to use. GUIX="$abs_top_builddir/scripts/guix" export GUIX |