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

The android utility's GUI should work and wrapper scripts in bin/ are replaced by symlinks

Browse Source
This commit is contained in:
Sander van der Burg 2013-08-07 22:12:44 +02:00
parent e7e4551baa
commit a9b4851b74
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/mobile/androidenv/androidsdk.nix
View File

@ -2,8 +2,8 @@
, platformTools, buildTools, support, platforms, sysimages, addons , platformTools, buildTools, support, platforms, sysimages, addons
, zlib_32bit , zlib_32bit
, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit , libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit
, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa, alsaLib , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib
, freetype, fontconfig, gtk, atk, file , freetype, fontconfig, glib, gtk, atk, file
}: }:
{platformVersions, abiVersions, useGoogleAPIs}: {platformVersions, abiVersions, useGoogleAPIs}:
@ -56,7 +56,15 @@ stdenv.mkDerivation {
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
done done
# The emulators need additional libraries, which are not in the RPATH => let's wrap them # The android script has a hardcoded reference to /bin/ls that must be patched
sed -i -e "s|/bin/ls|ls|" android
# The android script used SWT and wants to dynamically load some GTK+ stuff.
# The following wrapper ensures that they can be found:
wrapProgram `pwd`/android \
--prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
# The emulators need additional libraries, which are dynamically loaded => let's wrap them
for i in emulator emulator-arm emulator-mips emulator-x86 for i in emulator emulator-arm emulator-mips emulator-x86
do do
@ -174,11 +182,7 @@ stdenv.mkDerivation {
do do
if [ ! -d $i ] && [ -x $i ] if [ ! -d $i ] && [ -x $i ]
then then
( echo '#! ${stdenv.shell} -e' ln -sf $i $out/bin/$(basename $i)
echo "cd $out/libexec/android-sdk-*/tools"
echo "exec ./$(basename $i) \"\$@\"" ) > $out/bin/$(basename $i)
chmod +x $out/bin/$(basename $i)
fi fi
done done
@ -186,11 +190,7 @@ stdenv.mkDerivation {
do do
if [ ! -d $i ] && [ -x $i ] if [ ! -d $i ] && [ -x $i ]
then then
( echo '#! ${stdenv.shell} -e' ln -sf $i $out/bin/$(basename $i)
echo "cd $out/libexec/android-sdk-*/platform-tools"
echo "exec ./$(basename $i) \"\$@\"") > $out/bin/$(basename $i)
chmod +x $out/bin/$(basename $i)
fi fi
done done
''; '';

4
pkgs/development/mobile/androidenv/default.nix
View File

@ -36,8 +36,8 @@ rec {
androidsdk = import ./androidsdk.nix { androidsdk = import ./androidsdk.nix {
inherit (pkgs) stdenv fetchurl unzip makeWrapper; inherit (pkgs) stdenv fetchurl unzip makeWrapper;
inherit (pkgs) freetype fontconfig gtk atk mesa file alsaLib; inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib;
inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst;
inherit platformTools buildTools support platforms sysimages addons; inherit platformTools buildTools support platforms sysimages addons;