File tree Expand file tree Collapse file tree 1 file changed +2
-4
lines changed Expand file tree Collapse file tree 1 file changed +2
-4
lines changed Original file line number Diff line number Diff line change 191
191
# `--with` flags for libraries needed for RTS linker
192
192
configureFlags = [
193
193
"--datadir=$doc/share/doc/ghc"
194
- ] ++ lib . optionals ( ! targetPlatform . isGhcjs ) [ "--with-curses-includes=${ targetPackages . ncurses . dev } /include" "--with-curses-libraries=${ targetPackages . ncurses . out } /lib"
194
+ ] ++ lib . optionals ( ! targetPlatform . isGhcjs && ! targetPlatform . isAndroid ) [ "--with-curses-includes=${ targetPackages . ncurses . dev } /include" "--with-curses-libraries=${ targetPackages . ncurses . out } /lib"
195
195
] ++ lib . optionals ( targetLibffi != null && ! targetPlatform . isGhcjs ) [ "--with-system-libffi" "--with-ffi-includes=${ targetLibffi . dev } /include" "--with-ffi-libraries=${ targetLibffi . out } /lib"
196
196
] ++ lib . optionals ( ! enableIntegerSimple && ! targetPlatform . isGhcjs ) [
197
197
"--with-gmp-includes=${ targetGmp . dev } /include" "--with-gmp-libraries=${ targetGmp . out } /lib"
@@ -225,13 +225,11 @@ let
225
225
;
226
226
227
227
# Splicer will pull out correct variations
228
- libDeps = platform : lib . optional ( enableTerminfo && ! targetPlatform . isGhcjs ) [ targetPackages . ncurses targetPackages . ncurses . dev ]
228
+ libDeps = platform : lib . optional ( enableTerminfo && ! targetPlatform . isGhcjs && ! targetPlatform . isAndroid ) [ targetPackages . ncurses targetPackages . ncurses . dev ]
229
229
++ lib . optional ( ! targetPlatform . isGhcjs ) targetLibffi
230
230
++ lib . optional ( ! enableIntegerSimple && ! targetPlatform . isGhcjs ) gmp
231
231
++ lib . optional ( platform . libc != "glibc" && ! targetPlatform . isWindows ) libiconv
232
232
++ lib . optional ( enableNUMA && platform . isLinux && ! platform . isAarch32 && ! platform . isAndroid ) numactl
233
- # Even with terminfo disabled some older ghc cross arm and windows compilers do not build unless `ncurses` is found and they seem to want the buildPlatform version
234
- ++ lib . optional ( ! enableTerminfo && haskell-nix . haskellLib . isCrossTarget && ( stdenv . targetPlatform . isAarch64 || stdenv . targetPlatform . isWindows ) && builtins . compareVersions ghc-version "8.10" < 0 ) ncurses . dev
235
233
++ lib . optional enableDWARF ( lib . getLib elfutils ) ;
236
234
237
235
toolsForTarget =
You can’t perform that action at this time.
0 commit comments