b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #142771 from primeos/android-tools

Browse source
This commit is contained in:
Sandro 2021-10-26 23:53:36 +02:00 committed by GitHub
parent aae7b95f57 1c9b455262
commit 113fcf34ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,11 +9,11 @@ in
stdenv.mkDerivation rec {
pname = "android-tools";
version = "31.0.2";
version = "31.0.3";
src = fetchurl {
url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
sha256 = "sha256-YbO/bCQMsLTQzP72lsVZhuBmV4Q2J9+VD9z2iBrw+NQ=";
sha256 = "0adhws565ny90vzh5jpkbcai8sfs3b9acs0bgl6bm9z1nr2xklnp";
};
patches = [
@ -27,10 +27,6 @@ stdenv.mkDerivation rec {
})
];
postPatch = ''
sed -i -E "0,/import api_pb2/ s//from google.protobuf import api_pb2/" vendor/avb/aftltool.py
'';
nativeBuildInputs = [ cmake perl go ];
buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 fmt_7 ];
propagatedBuildInputs = [ pythonEnv ];
@ -43,7 +39,6 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
install -Dm755 ../vendor/avb/aftltool.py -t $out/bin
install -Dm755 ../vendor/avb/avbtool.py -t $out/bin
install -Dm755 ../vendor/mkbootimg/mkbootimg.py $out/bin/mkbootimg
'';