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.
Showing
- build-aux/pre-inst-env.in 0 additions, 4 deletionsbuild-aux/pre-inst-env.in
- config-daemon.ac 0 additions, 2 deletionsconfig-daemon.ac
- nix/libstore/build.cc 5 additions, 6 deletionsnix/libstore/build.cc
- nix/local.mk 0 additions, 7 deletionsnix/local.mk
- nix/nix-daemon/guix-daemon.cc 1 addition, 8 deletionsnix/nix-daemon/guix-daemon.cc
- nix/nix-daemon/nix-daemon.cc 7 additions, 1 deletionnix/nix-daemon/nix-daemon.cc
- nix/scripts/offload.in 0 additions, 11 deletionsnix/scripts/offload.in
Loading
Please register or sign in to comment