diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/tools/misc/android-tools/default.nix | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/android-tools/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/android-tools/default.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/tools/misc/android-tools/default.nix b/nixpkgs/pkgs/tools/misc/android-tools/default.nix index 6436e692ae44..6276d50c73d4 100644 --- a/nixpkgs/pkgs/tools/misc/android-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/android-tools/default.nix @@ -16,6 +16,19 @@ stdenv.mkDerivation rec { hash = "sha256-YCNOy8oZoXp+L0akWBlg1kW3xVuHDZJKIUlMdqb1SOw="; }; + patches = [ + # Fix building with newer protobuf versions. + (fetchurl { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/android-tools/-/raw/295ad7d5cb1e3b4c75bd40281d827f9168bbaa57/protobuf-23.patch"; + hash = "sha256-KznGgZdYT6e5wG3gtfJ6i93bYfp/JFygLW/ZzvXUA0Y="; + }) + ]; + + # Fix linking with private abseil-cpp libraries. + postPatch = '' + sed -i '/^find_package(Protobuf REQUIRED)$/i find_package(protobuf CONFIG)' vendor/CMakeLists.txt + ''; + nativeBuildInputs = [ cmake pkg-config perl go ]; buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; propagatedBuildInputs = [ pythonEnv ]; |