Merge pull request #142771 from primeos/android-tools
This commit is contained in:
commit
113fcf34ab
|
@ -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
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue