File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -11,18 +11,24 @@ final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isAndroid ({
11
11
'' ;
12
12
# my current thinking is that this is due to the android toolchain using r23, api30.
13
13
} ) ;
14
- libffi = prev . libffi . overrideAttrs ( _ : {
14
+ libffi = prev . libffi . overrideAttrs ( old : {
15
15
dontDisableStatic = true ;
16
+ configureFlags = old . configureFlags ++ [ "--disable-shared" ] ;
16
17
17
18
hardeningDisable = [ "fortify" "stackprotector" "format" ] ;
18
19
# see libiconv. We want to target a lower minsdk
19
20
postConfigure = ''
20
21
echo "#undef HAVE_MEMFD_CREATE" >> aarch64-unknown-linux-android/fficonfig.h
21
22
'' ;
22
23
} ) ;
23
- gmp6 = ( prev . gmp6 . override { withStatic = true ; } ) . overrideAttrs ( _ : {
24
+ gmp6 = ( prev . gmp6 . override { withStatic = true ; } ) . overrideAttrs ( old : {
24
25
hardeningDisable = [ "fortify" "stackprotector" "format" ] ;
26
+ configureFlags = old . configureFlags ++ [ "--disable-shared" ] ;
25
27
} ) ;
28
+ zlib = prev . zlib . override { shared = false ; static = true ; } ;
29
+
26
30
} ) // prev . lib . optionalAttrs prev . stdenv . targetPlatform . isAndroid ( {
27
- bionic = prev . bionic . override { enableStatic = true ; } ;
31
+ # we still need the shared libraries to link against on the platform. GHC
32
+ # has been neutered to not even try loading shared libs and will use dynamic ones.
33
+ bionic = prev . bionic . override { enableStatic = true ; enableShared = true ; } ;
28
34
} )
You can’t perform that action at this time.
0 commit comments