JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #46720 from baldo/android-platform-tools

Browse Source 
android-platform-tools: 26.0.2 -> 28.0.1
This commit is contained in:
Matthew Bauer 2018-10-05 22:42:30 -05:00 committed by GitHub
commit deee27973e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/mobile/androidenv/platform-tools.nix
View File

@ -6,16 +6,16 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "26.0.2"; version = "28.0.1";
name = "android-platform-tools-r${version}"; name = "android-platform-tools-r${version}";
src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
then fetchurl { then fetchurl {
url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip";
sha256 = "0695npvxljbbh8xwfm65k34fcpyfkzvfkssgnp46wkmnq8w5mcb3"; sha256 = "14kkr9xib5drjjd0bclm0jn3f5xlmlg652mbv4xd83cv7a53a49y";
} }
else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl {
url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip"; url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip";
sha256 = "0gy7apw9pmnnm41z6ywglw5va4ghmny4j57778may4q7ar751l56"; sha256 = "117syrddq1haicwyjzd1p4pfphj0wldjs7w10fpk3n2b7yp37j1v";
} }
else throw "System ${stdenv.hostPlatform.system} not supported!"; else throw "System ${stdenv.hostPlatform.system} not supported!";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
'' ''
for i in adb dmtracedump fastboot hprof-conv sqlite3 for i in adb dmtracedump e2fsdroid fastboot hprof-conv make_f2fs mke2fs sload_f2fs sqlite3
do do
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i 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 patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:`pwd`/lib64 $i