Include terminfo in musl GHC

input-output-hk · Nov 30, 2022 · 60b3457 · 60b3457
1 parent 6a66356
commit 60b3457
Show file tree

Hide file tree

Showing 5 changed files with 114 additions and 1 deletion.
diff --git a/compiler/ghc/default.nix b/compiler/ghc/default.nix
@@ -597,6 +597,8 @@ stdenv.mkDerivation (rec {
 } // lib.optionalAttrs useHadrian {
   buildPhase = ''
     ${hadrian}/bin/hadrian ${hadrianArgs}
+  '' + lib.optionalString targetPlatform.isMusl ''
+    ${hadrian}/bin/hadrian ${hadrianArgs} stage1:lib:terminfo
   '';
 
   # Hadrian's installation only works for native compilers, and is broken for cross compilers.

diff --git a/...4-unknown-linux-musl-x86_64-unknown-linux-musl-ghc-9.4.1-x86_64-linux/ghc-pkg/dump-global b/...4-unknown-linux-musl-x86_64-unknown-linux-musl-ghc-9.4.1-x86_64-linux/ghc-pkg/dump-global
diff --git a/...4-unknown-linux-musl-x86_64-unknown-linux-musl-ghc-9.4.2-x86_64-linux/ghc-pkg/dump-global b/...4-unknown-linux-musl-x86_64-unknown-linux-musl-ghc-9.4.2-x86_64-linux/ghc-pkg/dump-global
diff --git a/...4-unknown-linux-musl-x86_64-unknown-linux-musl-ghc-9.4.3-x86_64-linux/ghc-pkg/dump-global b/...4-unknown-linux-musl-x86_64-unknown-linux-musl-ghc-9.4.3-x86_64-linux/ghc-pkg/dump-global
diff --git a/overlays/ghc-packages.nix b/overlays/ghc-packages.nix
@@ -93,7 +93,7 @@ let
       then "windows"
       else if final.stdenv.hostPlatform.isGhcjs
         then "ghcjs"
-        else if final.haskell-nix.haskellLib.isCrossHost || (final.stdenv.hostPlatform.isMusl && builtins.compareVersions ghc.version "9.4.1" >= 0)
+        else if final.haskell-nix.haskellLib.isCrossHost
           then "cross"
           else "default";