diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/mobile/androidenv/androidndk-pkgs.nix | 2 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/default.nix | 12 | ||||
-rw-r--r-- | pkgs/stdenv/cross/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index a0f684d37cc75..5c42f7bc3289f 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -18,7 +18,7 @@ let "armv5tel-unknown-linux-androideabi" = { arch = "arm"; triple = "arm-linux-androideabi"; - gccVer = "4.9"; + gccVer = "4.8"; }; "armv7a-unknown-linux-androideabi" = { arch = "arm"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index d6d6b8a0cadcf..3e1f00d6ad5ae 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -246,7 +246,7 @@ rec { sha256 = "00frcnvpcsngv00p6l2vxj4cwi2mwcm9lnjvm3zv4wrp6pss9pmw"; }; - androidndk = import ./androidndk.nix { + androidndk_17 = import ./androidndk.nix { inherit (buildPackages) p7zip makeWrapper; inherit (pkgs) @@ -256,6 +256,7 @@ rec { version = "17"; sha256 = "1jj3zy958zsidywqd5nwdyrnr72rf9zhippkl8rbqxfy8wxq2gds"; }; + androidndk = androidndk_17; androidndk_r8e = import ./androidndk_r8e.nix { inherit (buildPackages) @@ -276,7 +277,7 @@ rec { inherit androidsdk; }; - androidndkPkgs = import ./androidndk-pkgs.nix { + androidndkPkgs_17 = import ./androidndk-pkgs.nix { inherit (buildPackages) makeWrapper; inherit (pkgs) @@ -286,10 +287,11 @@ rec { # but for splicing messing up on infinite recursion for the variants we # *dont't* use. Using this workaround, but also making a test to ensure # these two really are the same. - buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk; - inherit androidndk; - targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs; + buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17; + androidndk = androidndk_17; + targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_17; }; + androidndkPkgs = androidndkPkgs_17; androidndkPkgs_10e = import ./androidndk-pkgs.nix { inherit (buildPackages) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 973be9831861f..ab42dd319a62e 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -42,7 +42,7 @@ in lib.init bootStages ++ [ cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt - then buildPackages.androidenv.androidndkPkgs.gcc + then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc else buildPackages.gcc; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47c8f1e58724d..837995fb61a20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8695,7 +8695,7 @@ with pkgs; # TODO(@Ericson2314): Build bionic libc from source bionic = assert hostPlatform.useAndroidPrebuilt; - androidenv.androidndkPkgs.libraries; + androidenv."androidndkPkgs_${hostPlatform.ndkVer}".libraries; bobcat = callPackage ../development/libraries/bobcat { }; |