File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ let self =
14
14
, bash
15
15
16
16
, libiconv ? null
17
+ , libiconvReal ? null
17
18
18
19
, ncurses # TODO remove this once the cross compilers all work without
19
20
@@ -261,10 +262,10 @@ let
261
262
;
262
263
263
264
# 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 ) ]
265
266
++ lib . optional ( ! targetPlatform . isGhcjs ) targetLibffi
266
267
++ 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
268
269
++ lib . optional ( enableNUMA && platform . isLinux && ! platform . isAarch32 && ! platform . isAndroid ) numactl
269
270
++ lib . optional enableDWARF ( lib . getLib elfutils ) ;
270
271
You can’t perform that action at this time.
0 commit comments