android-tools: use system fmt
This commit is contained in:
parent
8ecc61c91a
commit
6120ab426d
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv, fetchurl
|
{ lib, stdenv, fetchurl, fetchpatch
|
||||||
, cmake, perl, go
|
, cmake, perl, go
|
||||||
, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2
|
, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2, fmt_7
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -12,8 +12,19 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-YbO/bCQMsLTQzP72lsVZhuBmV4Q2J9+VD9z2iBrw+NQ=";
|
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 ];
|
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:
|
# Don't try to fetch any Go modules via the network:
|
||||||
GOFLAGS = [ "-mod=vendor" ];
|
GOFLAGS = [ "-mod=vendor" ];
|
||||||
|
|
Loading…
Reference in a new issue