haskellPackages.terminfo: not a core pkg if cross compiling

GHC's cross build flavours disable the terminfo package, so it will
never be included if we are cross-compiling – setting it to null thus
breaks all builds depending on the package.

To fix this problem, we use the versioned attribute generated by
hackage2nix, just like we do for xhtml.

Closes #182785.
This commit is contained in:
sternenseemann
2022-07-25 23:42:29 +02:00
parent 7d66e14b70
commit f39aee2d8b
7 changed files with 14 additions and 6 deletions
@@ -38,7 +38,8 @@ self: super: {
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
text = null;
time = null;
transformers = null;
@@ -37,7 +37,8 @@ self: super: {
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
text = null;
time = null;
transformers = null;
@@ -37,7 +37,8 @@ self: super: {
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
text = null;
time = null;
transformers = null;
@@ -39,7 +39,8 @@ self: super: {
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
text = null;
time = null;
transformers = null;
@@ -39,7 +39,8 @@ self: super: {
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
text = null;
time = null;
transformers = null;
@@ -47,7 +47,8 @@ self: super: {
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
text = null;
time = null;
transformers = null;
+2
View File
@@ -326,6 +326,7 @@ let
random
QuickCheck
cabal2nix
terminfo # isn't bundled for cross
xhtml # isn't bundled for cross
;
};
@@ -337,6 +338,7 @@ let
random
QuickCheck
cabal2nix
terminfo # isn't bundled for cross
xhtml # isn't bundled for cross
;
};