Skip to content

Commit 9b0c2c8

Browse files
committed
Use libiconvReal to fix darwin wasm GHC build
1 parent cdbc5ba commit 9b0c2c8

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

compiler/ghc/default.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ let self =
1414
, bash
1515

1616
, libiconv ? null
17+
, libiconvReal ? null
1718

1819
, ncurses # TODO remove this once the cross compilers all work without
1920

@@ -261,10 +262,10 @@ let
261262
;
262263

263264
# Splicer will pull out correct variations
264-
libDeps = platform: lib.optional (enableTerminfo && !targetPlatform.isGhcjs && !targetPlatform.isWasm && !targetPlatform.isAndroid) [ (lib.getLib targetPackages.ncurses) (lib.getDev targetPackages.ncurses) ]
265+
libDeps = platform: lib.optionals (enableTerminfo && !targetPlatform.isGhcjs && !targetPlatform.isWasm && !targetPlatform.isAndroid) [ (lib.getLib targetPackages.ncurses) (lib.getDev targetPackages.ncurses) ]
265266
++ lib.optional (!targetPlatform.isGhcjs) targetLibffi
266267
++ lib.optional (!enableIntegerSimple && !targetPlatform.isGhcjs && !targetPlatform.isWasm) gmp
267-
++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
268+
++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconvReal
268269
++ lib.optional (enableNUMA && platform.isLinux && !platform.isAarch32 && !platform.isAndroid) numactl
269270
++ lib.optional enableDWARF (lib.getLib elfutils);
270271

0 commit comments

Comments
 (0)