@@ -220,17 +220,17 @@ in {
220
220
&& ( final . stdenv . targetPlatform . isAarch64 || final . stdenv . targetPlatform . is32bit ) )
221
221
( fromUntil "9.6.1" "9.11" ./patches/ghc/iserv-syms.patch )
222
222
++ onAndroid ( until "9.0" ./patches/ghc/ghc-8.10.7-weak-symbols-2.patch )
223
- ++ onDarwin ( onAarch64 ( until "9.0" ./patches/ghc/ghc-8.10.7-rts-aarch64-darwin.patch )
224
- ++ onAndroid ( onAarch32 ( until "9.2" ./patches/ghc/ghc-8.10-android.patch )
225
- ++ onAndroid ( onAarch32 ( until "9.2" ./patches/ghc/ghc-8.10.7-android-bionic-symbols.patch )
226
- ++ onAndroid ( onAarch32 ( until "9.2" ./patches/ghc/ghc-8.10.7-bionic-libc.patch )
227
- ++ onAndroid ( onAarch32 ( until "9.2" ./patches/ghc/ghc-8.10.7-cross-dont-build-stage2-tools.patch )
223
+ ++ onDarwin ( onAarch64 ( until "9.0" ./patches/ghc/ghc-8.10.7-rts-aarch64-darwin.patch ) )
224
+ ++ onAndroid ( onAarch32 ( until "9.2" ./patches/ghc/ghc-8.10-android.patch ) )
225
+ ++ onAndroid ( onAarch32 ( until "9.2" ./patches/ghc/ghc-8.10.7-android-bionic-symbols.patch ) )
226
+ ++ onAndroid ( onAarch32 ( until "9.2" ./patches/ghc/ghc-8.10.7-bionic-libc.patch ) )
227
+ ++ onAndroid ( onAarch32 ( until "9.2" ./patches/ghc/ghc-8.10.7-cross-dont-build-stage2-tools.patch ) )
228
228
++ onAndroid ( fromUntil "9.0" "9.8" ./patches/ghc/ghc-9.6-hadrian-android.patch )
229
229
++ onMusl ( onAarch64 ( fromUntil "9.0" "9.8" ./patches/ghc/ghc-9.6-hadrian-strip-cmd.patch ) )
230
230
++ on32bit ( from "9.0" ./patches/ghc/ghc-9.6-32bit-cmm.patch )
231
231
# this one is to allow linking extra symbols from iserv.
232
232
# This one will lead to segv's on darwin, when calling `strlen` during lookupStrHashTable. `strlen` ends up being called with 0x0.
233
- ++ final . lib . optionls (
233
+ ++ final . lib . optionals (
234
234
( final . stdenv . targetPlatform . isAndroid || final . stdenv . targetPlatform . isLinux )
235
235
&& ( final . stdenv . targetPlatform . isAarch64 || final . stdenv . targetPlatform . is32bit ) )
236
236
( fromUntil "9.6.1" "9.10" ./patches/ghc/iserv-syms.patch )
0 commit comments