From 0e91a58bbe54970eb1b825deaa9de99103405c30 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 8 Aug 2013 10:40:09 +0200 Subject: [PATCH] The android GUI does not work if Oracle's JDK is installed. This patch forces it to use OpenJDK --- pkgs/development/mobile/androidenv/androidsdk.nix | 3 ++- pkgs/development/mobile/androidenv/default.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index d6c751049d4b..38377cf8bbb4 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -3,7 +3,7 @@ , zlib_32bit , libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib -, freetype, fontconfig, glib, gtk, atk, file +, freetype, fontconfig, glib, gtk, atk, file, jdk }: {platformVersions, abiVersions, useGoogleAPIs}: @@ -62,6 +62,7 @@ stdenv.mkDerivation { # 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 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 diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index e12f9096994d..3339a065e2ae 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -36,7 +36,7 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib; + inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib jdk; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst; inherit platformTools buildTools support platforms sysimages addons;