diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index abf9bbb48653..99ee4d101b29 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -1,15 +1,21 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, build-tools }: +{ lib +, stdenv +, fetchurl +, makeWrapper +, jdk_headless +, aapt +}: stdenv.mkDerivation rec { pname = "apktool"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "sha256-szEyPr8yXWPhM3WmFHkV+drASPDx+GeDgG+SWUF0jbw="; + hash = "sha256-e0qOFwPiKNIG2ylkS3EUFofYoRG1WwObCLAt+kQ6sPk="; }; dontUnpack = true; @@ -19,23 +25,20 @@ stdenv.mkDerivation rec { sourceRoot = "."; installPhase = - let - tools = builtins.head build-tools; - in '' + '' install -D ${src} "$out/libexec/apktool/apktool.jar" mkdir -p "$out/bin" - makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ + makeWrapper "${jdk_headless}/bin/java" "$out/bin/apktool" \ --add-flags "-jar $out/libexec/apktool/apktool.jar" \ - --prefix PATH : "${tools}/libexec/android-sdk/build-tools/${tools.version}" + --prefix PATH : ${lib.getBin aapt} ''; meta = with lib; { description = "A tool for reverse engineering Android apk files"; - homepage = "https://ibotpeaches.github.io/Apktool/"; + homepage = "https://ibotpeaches.github.io/Apktool/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ offline ]; - platforms = with platforms; unix; + platforms = with platforms; unix; }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1984b3890d75..74b581e33fa9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3055,9 +3055,7 @@ with pkgs; apksigner = callPackage ../development/tools/apksigner { }; - apktool = callPackage ../development/tools/apktool { - inherit (androidenv.androidPkgs_9_0) build-tools; - }; + apktool = callPackage ../development/tools/apktool { }; appimage-run = callPackage ../tools/package-management/appimage-run { }; appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix {