Merge pull request #42397 from obsidiansystems/more-android-fixes

androidndk: cleanups
This commit is contained in:
John Ericson
2018-06-22 17:17:53 -04:00
committed by GitHub
3 changed files with 19 additions and 12 deletions
@@ -226,7 +226,7 @@ rec {
androidndk_10e = import ./androidndk.nix {
inherit (buildPackages)
p7zip makeWrapper;
unzip makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses5 lib python3 libcxx
coreutils file findutils gawk gnugrep gnused jdk which;
@@ -237,7 +237,7 @@ rec {
androidndk_16b = import ./androidndk.nix {
inherit (buildPackages)
p7zip makeWrapper;
unzip makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses5 lib python3 libcxx
coreutils file findutils gawk gnugrep gnused jdk which;
@@ -248,7 +248,7 @@ rec {
androidndk_17 = import ./androidndk.nix {
inherit (buildPackages)
p7zip makeWrapper;
unzip makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses5 lib python3 libcxx
coreutils file findutils gawk gnugrep gnused jdk which;