diff options
author | Mustafa Çalışkan <musfay@protonmail.com> | 2021-07-27 17:14:53 +0300 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2021-07-27 20:03:27 +0200 |
commit | 6120ab426d8d652ff9d42caf1abc4e268af0bcb1 (patch) | |
tree | 2978b13e199d2e1262faf3caa6a86837072787c1 /pkgs/tools/misc/android-tools | |
parent | 8ecc61c91a596df7d3293603a9c2384190c1b89a (diff) |
android-tools: use system fmt
Diffstat (limited to 'pkgs/tools/misc/android-tools')
-rw-r--r-- | pkgs/tools/misc/android-tools/default.nix | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index 1654b008aa556..b18366b057f94 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch , cmake, perl, go -, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 +, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2, fmt_7 }: stdenv.mkDerivation rec { @@ -12,8 +12,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-YbO/bCQMsLTQzP72lsVZhuBmV4Q2J9+VD9z2iBrw+NQ="; }; + 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" ]; + }) + ]; + nativeBuildInputs = [ cmake perl go ]; - buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; + buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 fmt_7 ]; # Don't try to fetch any Go modules via the network: GOFLAGS = [ "-mod=vendor" ]; |