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 /config-daemon.ac | |
| parent | 9fcc35c51fd579b3bb7b4f61cba6973675c3922c (diff) | |
| download | guix-bc69ea2d605810cc32e13ed03d5848b8dc358b61.tar guix-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 'config-daemon.ac')
| -rw-r--r-- | config-daemon.ac | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index 50227e310c..3d92e8f778 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -150,8 +150,6 @@ if test "x$guix_build_daemon" = "xyes"; then GUIX_CHECK_LOCALSTATEDIR AC_CONFIG_FILES([nix/scripts/substitute], [chmod +x nix/scripts/substitute]) - AC_CONFIG_FILES([nix/scripts/offload], - [chmod +x nix/scripts/offload]) fi AM_CONDITIONAL([HAVE_LIBBZ2], [test "x$HAVE_LIBBZ2" = "xyes"]) |