android-tools: 35.0.1 -> 35.0.2

Diff: https://github.com/nmeum/android-tools/compare/35.0.1...35.0.2

pkgs/tools/misc/android-tools/default.nix

@@ -8,14 +8,16 @@
   perl,
   go,
   python3,
-  protobuf_29, # does not build with 30+
+  protobuf,
   zlib,
   gtest,
   brotli,
   lz4,
   zstd,
-  libusb1,
   pcre2,
+  fetchpatch2,
+  fmt,
+  udev,
 }:
 
 let
@@ -24,13 +26,22 @@ in
 
 stdenv.mkDerivation rec {
   pname = "android-tools";
-  version = "35.0.1";
+  version = "35.0.2";
 
   src = fetchurl {
     url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
-    hash = "sha256-ZUAwx/ltJdciTNaGH6wUoEPPHTmA9AKIzfviGflP+vk=";
+    hash = "sha256-0sMiIoAxXzbYv6XALXYytH42W/4ud+maNWT7ZXbwQJc=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/android-tools/-/raw/dd0234790b42b48567b64a3024fc2ec6c7ab6c21/android-tools-35.0.2-fix-protobuf-30.0-compilation.patch";
+      stripLen = 1;
+      extraPrefix = "vendor/extras/";
+      hash = "sha256-WSfU+0XIrxxlCjAIR49l9JvX9C6xCXirhLFHMMvNmJk=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja
@@ -39,14 +50,15 @@ stdenv.mkDerivation rec {
     go
   ];
   buildInputs = [
-    protobuf_29
+    protobuf
     zlib
     gtest
     brotli
     lz4
     zstd
-    libusb1
     pcre2
+    fmt
+    udev
   ];
   propagatedBuildInputs = [ pythonEnv ];
 
@@ -54,7 +66,14 @@ stdenv.mkDerivation rec {
     export GOCACHE=$TMPDIR/go-cache
   '';
 
-  meta = with lib; {
+  cmakeFlags = [
+    (lib.cmakeBool "CMAKE_FIND_PACKAGE_PREFER_CONFIG" true)
+    (lib.cmakeBool "protobuf_MODULE_COMPATIBLE" true)
+    (lib.cmakeBool "ANDROID_TOOLS_LIBUSB_ENABLE_UDEV" true)
+    (lib.cmakeBool "ANDROID_TOOLS_USE_BUNDLED_LIBUSB" true)
+  ];
+
+  meta = {
     description = "Android SDK platform tools";
     longDescription = ''
       Android SDK Platform-Tools is a component for the Android SDK. It
@@ -74,12 +93,12 @@ stdenv.mkDerivation rec {
     # https://developer.android.com/studio/command-line#tools-platform
     # https://developer.android.com/studio/releases/platform-tools
     homepage = "https://github.com/nmeum/android-tools";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       unicode-dfs-2015
+      mit
     ];
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
-    teams = [ teams.android ];
+    platforms = lib.platforms.unix;
+    teams = [ lib.teams.android ];
   };
 }