Merge pull request #188339 from amjoseph-nixpkgs/pr/hydra/dontTryToBuild

NixOS · Dec 27, 2022 · b536d69 · b536d69
2 parents 70604e4 + 63d9913
commit b536d69
Showing 1 changed file with 8 additions and 1 deletion.
diff --git 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"]);
 }