lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

android-tools: 34.0.1 -> 34.0.4

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
```

+4 -20
+4 -20
pkgs/tools/misc/android-tools/default.nix
··· 1 1 { lib, stdenv, fetchurl 2 - , cmake, pkg-config, perl, go, python3 2 + , cmake, ninja, pkg-config, perl, go, python3 3 3 , protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 4 4 }: 5 5 ··· 9 9 10 10 stdenv.mkDerivation rec { 11 11 pname = "android-tools"; 12 - version = "34.0.1"; 12 + version = "34.0.4"; 13 13 14 14 src = fetchurl { 15 15 url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; 16 - hash = "sha256-YCNOy8oZoXp+L0akWBlg1kW3xVuHDZJKIUlMdqb1SOw="; 16 + hash = "sha256-eiL/nOqB/0849WBoeFjo+PtzNiRBJZfjzBqwJi+No6E="; 17 17 }; 18 18 19 - patches = [ 20 - # Fix building with newer protobuf versions. 21 - (fetchurl { 22 - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/android-tools/-/raw/295ad7d5cb1e3b4c75bd40281d827f9168bbaa57/protobuf-23.patch"; 23 - hash = "sha256-KznGgZdYT6e5wG3gtfJ6i93bYfp/JFygLW/ZzvXUA0Y="; 24 - }) 25 - ]; 26 - 27 - # Fix linking with private abseil-cpp libraries. 28 - postPatch = '' 29 - sed -i '/^find_package(Protobuf REQUIRED)$/i find_package(protobuf CONFIG)' vendor/CMakeLists.txt 30 - ''; 31 - 32 - nativeBuildInputs = [ cmake pkg-config perl go ]; 19 + nativeBuildInputs = [ cmake ninja pkg-config perl go ]; 33 20 buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; 34 21 propagatedBuildInputs = [ pythonEnv ]; 35 - 36 - # Don't try to fetch any Go modules via the network: 37 - GOFLAGS = [ "-mod=vendor" ]; 38 22 39 23 preConfigure = '' 40 24 export GOCACHE=$TMPDIR/go-cache