Loading pkgs/tools/misc/android-tools/default.nix +4 −20 Original line number Diff line number Diff line { lib, stdenv, fetchurl , cmake, pkg-config, perl, go, python3 , cmake, ninja, pkg-config, perl, go, python3 , protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 }: Loading @@ -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 ''; Loading Loading
pkgs/tools/misc/android-tools/default.nix +4 −20 Original line number Diff line number Diff line { lib, stdenv, fetchurl , cmake, pkg-config, perl, go, python3 , cmake, ninja, pkg-config, perl, go, python3 , protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 }: Loading @@ -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 ''; Loading