Merge pull request #50596 from svanderburg/mobile-updates

Mobile updates
2018-12-24 15:52:33 +01:00
parent a5306b311b e37f0454ac
commit a27aa247c0
91 changed files with 6464 additions and 9984 deletions
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, buildTools }:
+{ stdenv, fetchurl, makeWrapper, jre, build-tools }:

 stdenv.mkDerivation rec {
  name = "apktool-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    mkdir -p "$out/bin"
    makeWrapper "${jre}/bin/java" "$out/bin/apktool" \
        --add-flags "-jar $out/libexec/apktool/apktool.jar" \
-        --prefix PATH : "${buildTools.v25_0_1}/build-tools/25.0.1/"
+        --prefix PATH : "${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3"
  '';

  meta = with stdenv.lib; {