diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2020-08-13 10:54:43 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-08-17 23:51:59 -0500 |
commit | ff33855bf0a724ea8c2502b176fd90c9d856b378 (patch) | |
tree | 7552898fc291d838da3cf6933c94566704a79283 /pkgs/development/androidndk-pkgs/default.nix | |
parent | 4cbca0893af3b4bdac508894fb6d9b10040a5179 (diff) |
android: readd 18b ndk
This is referenced in all-packages.nix, so might as well leave it heref or now.
Diffstat (limited to 'pkgs/development/androidndk-pkgs/default.nix')
-rw-r--r-- | pkgs/development/androidndk-pkgs/default.nix | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index ce5a868f4ecdd..10819d49ed300 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -2,6 +2,35 @@ }: { + "18b" = + let + ndkVersion = "18.1.5063045"; + + buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + + androidComposition = androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + in + import ./androidndk-pkgs.nix { + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + stdenv + runCommand wrapBintoolsWith wrapCCWith; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, + # 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 = buildAndroidComposition.ndk-bundle; + androidndk = androidComposition.ndk-bundle; + targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b; + }; + "21" = let ndkVersion = "21.0.6113669"; |