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

Updated Android SDK to version 22.05, updated all plugins, and added mesa to the search path of the emulators to enable OpenGL acceleration

Browse Source
This commit is contained in:
Sander van der Burg
2013-07-31 16:00:57 +02:00
parent b6d43bb6a3
commit ab9be1b809
15 changed files with 445 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,23 +1,23 @@
{ stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper
, platformTools, support, platforms, sysimages, addons
, platformTools, buildTools, support, platforms, sysimages, addons
, zlib_32bit
, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit
, libX11, libXext, libXrender, libxcb, libXau, libXdmcp
, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit
, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa
, freetype, fontconfig, gtk, atk
}:
{platformVersions, useGoogleAPIs}:
stdenv.mkDerivation {
name = "android-sdk-21";
name = "android-sdk-22.05";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then fetchurl {
url = http://dl.google.com/android/android-sdk_r21-linux.tgz;
md5 = "7f8d73b629f808cdcfc9f9900bbd7580";
url = http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz;
md5 = "8201b10c21510f082c54f58a9bb082c8";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = http://dl.google.com/android/android-sdk_r21-macosx.zip;
md5 = "67e46adca90dd18d7291443f6c15d6af";
url = http://dl.google.com/android/android-sdk_r22.0.5-macosx.zip;
md5 = "94f3cbe896c332b94ee0408ae610a4b8";
}
else throw "platform not ${stdenv.system} supported!";
@@ -61,14 +61,14 @@ stdenv.mkDerivation {
for i in emulator emulator-arm emulator-mips emulator-x86
do
wrapProgram `pwd`/$i \
--prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib
--prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib
done
${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
for i in emulator64-arm emulator64-mips emulator64-x86
do
wrapProgram `pwd`/$i \
--prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib
--prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib
done
''}
''}
@@ -107,6 +107,7 @@ stdenv.mkDerivation {
cd ..
ln -s ${platformTools}/platform-tools
ln -s ${buildTools}/build-tools
ln -s ${support}/support
# Symlink required Google API add-ons