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

android-platform-tools: 23.0.1 -> 24, etc.

Browse Source 
- `adb` is now 64 bit. Linking against 64 bit libraries.
- Added `.lib` or `.out` postfix for 32 bit library packages.
- Some libraries are reside in `lib64` instead of `lib`.
- Other version bumps.
This commit is contained in:
taku0
2016-07-21 21:20:05 +09:00
parent 838781ce8a
commit c643c86035
16 changed files with 3816 additions and 3508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/mobile/androidenv/platform-tools.nix
+8 -8
View File
@@ -1,16 +1,16 @@
{stdenv, stdenv_32bit, zlib_32bit, fetchurl, unzip}:
{stdenv, zlib, fetchurl, unzip}:
stdenv.mkDerivation rec {
version = "23.0.1";
version = "24";
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";
sha1 = "94dcc5072b3d0d74cc69e4101958b6c2e227e738";
sha1 = "qabpsfhm7shvyjy6amdl7b3d41n64zsr";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip";
sha1 = "c461d66f3ca9fbae8ea0fa1a49c203b3b6fd653f";
sha1 = "5s808wby36xxkfmrj4va9dnc0rwsz2gh";
}
else throw "System ${stdenv.system} not supported!";
@@ -24,14 +24,14 @@ stdenv.mkDerivation rec {
''
for i in adb dmtracedump fastboot hprof-conv sqlite3
do
patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:`pwd`/lib $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
done
for i in etc1tool
do
patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit.out}/lib:`pwd`/lib $i
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:${zlib.out}/lib:`pwd`/lib64 $i
done
''}