From bf44d81df9ad72bc7d3ea37f2c7aa571eb0a8914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 20 Nov 2018 11:18:56 +0100 Subject: [PATCH] androidndk: 17c -> 18b --- pkgs/development/mobile/androidenv/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 9058da1c50a0..282924047aa4 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)