diff options
Diffstat (limited to 'pkgs/development/mobile/androidenv/androidsdk.nix')
| -rw-r--r-- | pkgs/development/mobile/androidenv/androidsdk.nix | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index f26b0d3f2f3c4..eb0c4295bcd5d 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -5,22 +5,22 @@ , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib , freetype, fontconfig, glib, gtk, atk, file, jdk, coreutils }: -{platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs?false, useGooglePlayServices?false}: +{ platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }: with { inherit (stdenv.lib) makeLibraryPath; }; stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "24.1.2"; + version = "24.4"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz"; - sha1 = "a46298bjpgzsnchhpcm1i86c4r50x638"; + sha1 = "eec87cdb9778718e4073b4ca326a46cdd084f901"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip"; - sha1 = "as109624lgrn8krylmyvm33yapqkzr00"; + sha1 = "a9b6f025a9691aef430b19b52e01844dbbcbf6b4"; } else throw "platform not ${stdenv.system} supported!"; @@ -55,12 +55,21 @@ stdenv.mkDerivation rec { done ''} - # The android script used SWT and wants to dynamically load some GTK+ stuff. - # The following wrapper ensures that they can be found: + # The following scripts used SWT and wants to dynamically load some GTK+ stuff. + # Creating these wrappers ensure that they can be found: + wrapProgram `pwd`/android \ --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk libXtst ]} + wrapProgram `pwd`/uiautomatorviewer \ + --prefix PATH : ${jdk}/bin \ + --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib + + wrapProgram `pwd`/hierarchyviewer \ + --prefix PATH : ${jdk}/bin \ + --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 |