BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

android-tools: 34.0.1 -> 34.0.4

Browse source 
The patch for linking with private `abseil-cpp` has been removed because
it is present in the upstream version already.

`ninja` has been added to the dependencies as building with `cmake`+`ninja`
is faster than with `cmake`+`make`.

The `-mod=vendor` go flag has been removed as the vendored version of
`boringssl` cannot be built as-is:

```
go: inconsistent vendoring in /build/android-tools-34.0.4/vendor/boringssl:
        golang.org/x/crypto@v0.6.0: is explicitly required in go.mod,
          but not marked as explicit in vendor/modules.txt
        golang.org/x/net@v0.7.0: is explicitly required in go.mod,
          but not marked as explicit in vendor/modules.txt
        golang.org/x/sys@v0.5.0: is explicitly required in go.mod,
          but not marked as explicit in vendor/modules.txt
        golang.org/x/term@v0.5.0: is explicitly required in go.mod,
          but not marked as explicit in vendor/modules.txt
```
This commit is contained in:
Samuel Tardieu 2023-09-19 12:44:58 +02:00
parent 272dba1e31
commit 48ed94664e
1 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/tools/misc/android-tools/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl
, cmake, pkg-config, perl, go, python3
, cmake, ninja, pkg-config, perl, go, python3
, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2
}:
@ -9,33 +9,17 @@ in
stdenv.mkDerivation rec {
pname = "android-tools";
version = "34.0.1";
version = "34.0.4";
src = fetchurl {
url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
hash = "sha256-YCNOy8oZoXp+L0akWBlg1kW3xVuHDZJKIUlMdqb1SOw=";
hash = "sha256-eiL/nOqB/0849WBoeFjo+PtzNiRBJZfjzBqwJi+No6E=";
};
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 ];
nativeBuildInputs = [ cmake ninja pkg-config perl go ];
buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ];
propagatedBuildInputs = [ pythonEnv ];
# Don't try to fetch any Go modules via the network:
GOFLAGS = [ "-mod=vendor" ];
preConfigure = ''
export GOCACHE=$TMPDIR/go-cache
'';