Merge pull request #43274 from bkchr/android_ndk_callpackage

androidndk: Use `callPackage` to support overriding the `fullNdk` option
This commit is contained in:
Matthew Bauer 2018-07-10 10:32:50 -04:00 committed by GitHub
commit 11e8ecf581
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -224,7 +224,7 @@ rec {
androidsdk_latest = androidsdk_8_0;
androidndk_10e = import ./androidndk.nix {
androidndk_10e = pkgs.callPackage ./androidndk.nix {
inherit (buildPackages)
unzip makeWrapper;
inherit (pkgs)
@ -235,7 +235,7 @@ rec {
sha256 = "032j3sgk93bjbkny84i17ph61dhjmsax9ddqng1zbi2p7dgl0pzf";
};
androidndk_16b = import ./androidndk.nix {
androidndk_16b = pkgs.callPackage ./androidndk.nix {
inherit (buildPackages)
unzip makeWrapper;
inherit (pkgs)
@ -246,7 +246,7 @@ rec {
sha256 = "00frcnvpcsngv00p6l2vxj4cwi2mwcm9lnjvm3zv4wrp6pss9pmw";
};
androidndk_17 = import ./androidndk.nix {
androidndk_17 = pkgs.callPackage ./androidndk.nix {
inherit (buildPackages)
unzip makeWrapper;
inherit (pkgs)