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

androidenv: fix broken, less frequently used command-line tools

Browse Source
This commit is contained in:
Sander van der Burg
2015-10-15 14:42:24 +00:00
parent 25033c50e8
commit 62e676b959
4 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/mobile/androidenv/platform-tools.nix
+9 -3
View File
@@ -1,4 +1,4 @@
{stdenv, stdenv_32bit, fetchurl, unzip}:
{stdenv, stdenv_32bit, zlib_32bit, fetchurl, unzip}:
stdenv.mkDerivation rec {
version = "23.0.1";
@@ -22,10 +22,16 @@ stdenv.mkDerivation rec {
${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
''
for i in adb fastboot
for i in adb dmtracedump fastboot hprof-conv sqlite3
do
patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:`pwd`/lib $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}/lib:`pwd`/lib $i
done
''}