mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-30 15:23:26 +03:00
Merge pull request #32289 from bhipple/feature/android-platform-tools-26.0.2
android-platform-tools: 26.0.0 -> 26.0.2
This commit is contained in:
commit
61a177a517
@ -1,16 +1,16 @@
|
||||
{stdenv, zlib, fetchurl, unzip}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "26.0.0";
|
||||
version = "26.0.2";
|
||||
name = "android-platform-tools-r${version}";
|
||||
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
|
||||
then fetchurl {
|
||||
url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip";
|
||||
sha256 = "02z5fxxdwd6359wmqdag9vvszdq49sm78cvfskqap18xa83q484h";
|
||||
sha256 = "0695npvxljbbh8xwfm65k34fcpyfkzvfkssgnp46wkmnq8w5mcb3";
|
||||
}
|
||||
else if stdenv.system == "x86_64-darwin" then fetchurl {
|
||||
url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip";
|
||||
sha256 = "13mcyi9l0mmmjr056z1i3rhpb4641iv0a5ky7ij0v8hwsb5r5lwq";
|
||||
sha256 = "0gy7apw9pmnnm41z6ywglw5va4ghmny4j57778may4q7ar751l56";
|
||||
}
|
||||
else throw "System ${stdenv.system} not supported!";
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
cd $out
|
||||
unzip $src
|
||||
cd platform-tools
|
||||
|
||||
|
||||
${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
|
||||
''
|
||||
for i in adb dmtracedump fastboot hprof-conv sqlite3
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
|
||||
patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:`pwd`/lib64 $i
|
||||
done
|
||||
|
||||
|
||||
for i in etc1tool
|
||||
do
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
|
||||
@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
|
||||
ln -sf $out/platform-tools/$i $out/bin/$i
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user