ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-05 03:57:58 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50837 from bkchr/android_ndk_18_b

Browse Source 
androidndk: 17c -> 18b
This commit is contained in:
Matthew Bauer 2018-12-15 13:35:12 -06:00 committed by GitHub
commit 676b840172
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/mobile/androidenv/default.nix
View File

@ -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)