Merge pull request #142771 from primeos/android-tools

authored by Sandro and committed by GitHub 113fcf34 aae7b95f

+2 -7
+2 -7
pkgs/tools/misc/android-tools/default.nix
··· 9 9 10 10 stdenv.mkDerivation rec { 11 11 pname = "android-tools"; 12 - version = "31.0.2"; 12 + version = "31.0.3"; 13 13 14 14 src = fetchurl { 15 15 url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; 16 - sha256 = "sha256-YbO/bCQMsLTQzP72lsVZhuBmV4Q2J9+VD9z2iBrw+NQ="; 16 + sha256 = "0adhws565ny90vzh5jpkbcai8sfs3b9acs0bgl6bm9z1nr2xklnp"; 17 17 }; 18 18 19 19 patches = [ ··· 27 27 }) 28 28 ]; 29 29 30 - postPatch = '' 31 - sed -i -E "0,/import api_pb2/ s//from google.protobuf import api_pb2/" vendor/avb/aftltool.py 32 - ''; 33 - 34 30 nativeBuildInputs = [ cmake perl go ]; 35 31 buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 fmt_7 ]; 36 32 propagatedBuildInputs = [ pythonEnv ]; ··· 43 39 ''; 44 40 45 41 postInstall = '' 46 - install -Dm755 ../vendor/avb/aftltool.py -t $out/bin 47 42 install -Dm755 ../vendor/avb/avbtool.py -t $out/bin 48 43 install -Dm755 ../vendor/mkbootimg/mkbootimg.py $out/bin/mkbootimg 49 44 '';