diff options
| author | Bastian Köcher <git@kchr.de> | 2018-11-20 11:18:56 +0100 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2018-11-20 11:21:42 +0100 |
| commit | bf44d81df9ad72bc7d3ea37f2c7aa571eb0a8914 (patch) | |
| tree | a9c87838c42aa68d88f15d03206ced738aa355b9 /pkgs/development/mobile/androidenv | |
| parent | c4cad8cfa7ba1c66199e064c93fe3525e919cb82 (diff) | |
| download | nixpkgs-bf44d81df9ad72bc7d3ea37f2c7aa571eb0a8914.tar nixpkgs-bf44d81df9ad72bc7d3ea37f2c7aa571eb0a8914.tar.gz nixpkgs-bf44d81df9ad72bc7d3ea37f2c7aa571eb0a8914.tar.bz2 nixpkgs-bf44d81df9ad72bc7d3ea37f2c7aa571eb0a8914.tar.lz nixpkgs-bf44d81df9ad72bc7d3ea37f2c7aa571eb0a8914.tar.xz nixpkgs-bf44d81df9ad72bc7d3ea37f2c7aa571eb0a8914.tar.zst nixpkgs-bf44d81df9ad72bc7d3ea37f2c7aa571eb0a8914.zip | |
androidndk: 17c -> 18b
Diffstat (limited to 'pkgs/development/mobile/androidenv')
| -rw-r--r-- | pkgs/development/mobile/androidenv/default.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 9058da1c50a..282924047aa 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -306,7 +306,21 @@ rec { x86_64-linux = "12cacc70c3fd2f40574015631c00f41fb8a39048"; }; }; - androidndk = androidndk_17c; + + androidndk_18b = pkgs.callPackage ./androidndk.nix { + inherit (buildPackages) + unzip makeWrapper; + inherit (pkgs) + stdenv fetchurl zlib ncurses5 lib python3 libcxx + coreutils file findutils gawk gnugrep gnused jdk which; + inherit platformTools; + version = "18b"; + sha1s = { + x86_64-darwin = "98cb9909aa8c2dab32db188bbdc3ac6207e09440"; + x86_64-linux = "500679655da3a86aecf67007e8ab230ea9b4dd7b"; + }; + }; + androidndk = androidndk_18b; androidndk_r8e = import ./androidndk_r8e.nix { inherit (buildPackages) |