diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-06-22 14:50:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-22 14:50:14 -0400 |
commit | 6c17928d525306e565024ffadc2409d3c274eef3 (patch) | |
tree | 8309368c4573152b47e2402be6207c1e400d5834 /pkgs/development | |
parent | 876598a2ddf88c51c67f5a9e3a67beb00c3a6c62 (diff) | |
parent | c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea (diff) |
Merge pull request #42378 from obsidiansystems/fix-android32
androidndk: Fix version selection
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/mobile/androidenv/androidndk-pkgs.nix | 2 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/default.nix | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 9541d62e16015..5c42f7bc3289f 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -23,7 +23,7 @@ let "armv7a-unknown-linux-androideabi" = { arch = "arm"; triple = "arm-linux-androideabi"; - gccVer = "4.8"; + gccVer = "4.9"; }; "aarch64-unknown-linux-android" = { arch = "arm64"; 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) |