From 63d9913007113c7cbd699c90160e045d064ee3f3 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 25 Aug 2022 17:47:42 -0700 Subject: [PATCH] release-cross.nix: skip job which requires build.canExec host --- pkgs/top-level/release-cross.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 8e951611bbc0..93e36360bf9c 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -218,5 +218,12 @@ in mkBootstrapToolsJob = drv: assert lib.elem drv.system supportedSystems; hydraJob' (lib.addMetaAttrs { inherit maintainers; } drv); - in lib.mapAttrsRecursiveCond (as: !lib.isDerivation as) (name: mkBootstrapToolsJob) tools; + in lib.mapAttrsRecursiveCond (as: !lib.isDerivation as) (name: mkBootstrapToolsJob) + # The `bootstrapTools.${platform}.bootstrapTools` derivation + # *unpacks* the bootstrap-files using their own `busybox` binary, + # so it will fail unless buildPlatform.canExecute hostPlatform. + # Unfortunately `bootstrapTools` also clobbers its own `system` + # attribute, so there is no way to detect this -- we must add it + # as a special case. + (builtins.removeAttrs tools ["bootstrapTools"]); }