Skip to content

Commit 15d240f

Browse files
committed
targetIconv
1 parent 440c07d commit 15d240f

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

compiler/ghc/default.nix

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

1616
, libiconv ? null
17-
, libiconvReal ? null
1817

1918
, ncurses # TODO remove this once the cross compilers all work without
2019

@@ -265,7 +264,7 @@ let
265264
libDeps = platform: lib.optionals (enableTerminfo && !targetPlatform.isGhcjs && !targetPlatform.isWasm && !targetPlatform.isAndroid) [ (lib.getLib targetPackages.ncurses) (lib.getDev targetPackages.ncurses) ]
266265
++ lib.optional (!targetPlatform.isGhcjs) targetLibffi
267266
++ lib.optional (!enableIntegerSimple && !targetPlatform.isGhcjs && !targetPlatform.isWasm) gmp
268-
++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) targetPackages.libiconv
267+
++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) targetIconv
269268
++ lib.optional (enableNUMA && platform.isLinux && !platform.isAarch32 && !platform.isAndroid) numactl
270269
++ lib.optional enableDWARF (lib.getLib elfutils);
271270

0 commit comments

Comments
 (0)