diff options
author | Sebastian Sellmeier <mail@sebastian-sellmeier.de> | 2022-11-02 21:24:32 +0100 |
---|---|---|
committer | Winter <winter@winter.cafe> | 2022-11-06 10:56:30 -0500 |
commit | 3cbd455a2d53d78b44930060a1219591d6fccf06 (patch) | |
tree | d88bc1c3223b1aa0dd6738a54c6c1529da8f2f74 /pkgs/tools/misc/android-tools | |
parent | 76796543e4f9c9318a22126042b804cd86a34d93 (diff) |
android-tools: 31.0.3p1 -> 33.0.3
Diffstat (limited to 'pkgs/tools/misc/android-tools')
-rw-r--r-- | pkgs/tools/misc/android-tools/default.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index 4d5eff546cc06..bb56d4fa9f8a6 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch , cmake, perl, go, python3 -, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2, fmt_7 +, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 }: let @@ -9,22 +9,14 @@ in stdenv.mkDerivation rec { pname = "android-tools"; - version = "31.0.3p1"; + version = "33.0.3"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - sha256 = "1f2svy381r798hjinrc2xiwz13gkkqxfill343zvv8jqkn8rzxhf"; + hash = "sha256-jOF02reB1d69Ke0PllciMfd3vuGbjvPBZ+M9PqdnC8U="; }; patches = [ - # fmt 8 breaks the build but we can use fmt 7 from Nixpkgs: - (fetchpatch { - # Vendor google's version of fmtlib - url = "https://github.com/nmeum/android-tools/commit/21061c1dfb006c22304053c1f6f9e48ae4cbe25a.patch"; - sha256 = "17mcsgfc3i8xq4hck0ppnzafh15aljxy7j2q4djcmwnvrkv9kx3s"; - revert = true; - excludes = [ "vendor/fmtlib" ]; - }) ./android-tools-kernel-headers-6.0.diff ]; @@ -37,7 +29,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake perl go ]; - buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 fmt_7 ]; + buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; propagatedBuildInputs = [ pythonEnv ]; # Don't try to fetch any Go modules via the network: |