From dc80b6913c582bebb3cd8f4c2df480feee94a5ce Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 23 Nov 2021 15:59:23 +0100 Subject: [PATCH] ghcWithPackages: GHC 8.10.7 still needs LLVM for aarch64-darwin This check was wrong and caused by a bit of confusion on my part. GHC >= 8.10.5 && < 9 supports aarch64-darwin via LLVM and GHC >= 9.2.1 introduces the NCG backend for aarch64-darwin. (cherry picked from commit 2f98c1824c750c2d0c6440b8c57a039092cb0cd3) --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 7b85d01876ed..e20456b86075 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -5,7 +5,7 @@ stdenv.targetPlatform.isx86 stdenv.targetPlatform.isPowerPC stdenv.targetPlatform.isSparc - ] ++ lib.optionals (lib.versionAtLeast ghc.version "9.2" || ghc.version == "8.10.7") [ + ] ++ lib.optionals (lib.versionAtLeast ghc.version "9.2") [ (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin) # TODO(@sternenseemann): Is armv7a supported for iOS? ]))