ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-27 15:49:39 +03:00
Code Issues Projects Releases Wiki Activity

The android GUI does not work if Oracle's JDK is installed. This patch forces it to use OpenJDK

Browse Source
This commit is contained in:
Sander van der Burg 2013-08-08 10:40:09 +02:00
parent bccba58c32
commit 0e91a58bbe
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
, 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, libXtst, mesa, alsaLib , 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}: {platformVersions, abiVersions, useGoogleAPIs}:
@ -62,6 +62,7 @@ stdenv.mkDerivation {
# The android script used SWT and wants to dynamically load some GTK+ stuff. # The android script used SWT and wants to dynamically load some GTK+ stuff.
# The following wrapper ensures that they can be found: # The following wrapper ensures that they can be found:
wrapProgram `pwd`/android \ wrapProgram `pwd`/android \
--prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
# The emulators need additional libraries, which are dynamically loaded => let's wrap them # The emulators need additional libraries, which are dynamically loaded => let's wrap them

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

@ -36,7 +36,7 @@ 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 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 (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst;
inherit platformTools buildTools support platforms sysimages addons; inherit platformTools buildTools support platforms sysimages addons;