haskellPackages: fix pkgsStatic on aarch64-darwin (#484571)

This commit is contained in:
Wolfgang Walther
2026-01-28 16:57:59 +00:00
committed by GitHub
@@ -72,10 +72,13 @@
stdenv.targetPlatform.isWindows
|| stdenv.targetPlatform.isGhcjs
# Before <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13932>,
# we couldn't force hadrian to build terminfo for cross.
# we couldn't force hadrian to build terminfo for different triples.
|| (
lib.versionOlder version "9.15.20250808"
&& (stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform != stdenv.targetPlatform)
&& (
stdenv.buildPlatform.config != stdenv.hostPlatform.config
|| stdenv.hostPlatform.config != stdenv.targetPlatform.config
)
)
),
@@ -353,7 +356,9 @@ let
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
# TODO(@Ericson2314) Make unconditional
targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
targetPrefix = lib.optionalString (
targetPlatform.config != hostPlatform.config
) "${targetPlatform.config}-";
# TODO(@sternenseemann): there's no stage0:exe:haddock target by default,
# so haddock isn't available for GHC cross-compilers. Can we fix that?