talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

android-tools: fix darwin build

Browse Source
This commit is contained in:
qzylinra 2025-08-12 12:21:28 +08:00 committed by Masum Reza
parent d963e658fd
commit 37a1895466
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/misc/android-tools/default.nix
View File

@ -35,10 +35,10 @@ stdenv.mkDerivation rec {
patches = [ patches = [
(fetchpatch2 { (fetchpatch2 {
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/android-tools/-/raw/dd0234790b42b48567b64a3024fc2ec6c7ab6c21/android-tools-35.0.2-fix-protobuf-30.0-compilation.patch"; url = "https://raw.githubusercontent.com/nmeum/android-tools/0c4d79943e23785589ce1881cbb5a9bc76d64d9b/patches/extras/0003-extras-libjsonpb-Fix-incompatibility-with-protobuf-v.patch";
stripLen = 1; stripLen = 1;
extraPrefix = "vendor/extras/"; extraPrefix = "vendor/extras/";
hash = "sha256-WSfU+0XIrxxlCjAIR49l9JvX9C6xCXirhLFHMMvNmJk="; hash = "sha256-PO6ZKP54ri2ujVa/uFXgMy/zMQjjIo4e/EPW2Cu6a1Q=";
}) })
]; ];
@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
zstd zstd
pcre2 pcre2
fmt fmt
udev ]
]; ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];
propagatedBuildInputs = [ pythonEnv ]; propagatedBuildInputs = [ pythonEnv ];
preConfigure = '' preConfigure = ''
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
(lib.cmakeBool "CMAKE_FIND_PACKAGE_PREFER_CONFIG" true) (lib.cmakeBool "CMAKE_FIND_PACKAGE_PREFER_CONFIG" true)
(lib.cmakeBool "protobuf_MODULE_COMPATIBLE" true) (lib.cmakeBool "protobuf_MODULE_COMPATIBLE" true)
(lib.cmakeBool "ANDROID_TOOLS_LIBUSB_ENABLE_UDEV" true) (lib.cmakeBool "ANDROID_TOOLS_LIBUSB_ENABLE_UDEV" stdenv.hostPlatform.isLinux)
(lib.cmakeBool "ANDROID_TOOLS_USE_BUNDLED_LIBUSB" true) (lib.cmakeBool "ANDROID_TOOLS_USE_BUNDLED_LIBUSB" true)
]; ];