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
pkgs/development/mobile/androidenv/default.nix
+9 -3
View File
@@ -3,10 +3,15 @@
rec {
platformTools = import ./platform-tools.nix {
inherit (pkgs) stdenv fetchurl unzip;
inherit (pkgs_i686) zlib ncurses;
stdenv_32bit = pkgs_i686.stdenv;
};
buildTools = import ./build-tools.nix {
inherit (pkgs) stdenv fetchurl unzip;
stdenv_32bit = pkgs_i686.stdenv;
zlib_32bit = pkgs_i686.zlib;
};
support = import ./support.nix {
inherit (pkgs) stdenv fetchurl unzip;
};
@@ -31,10 +36,10 @@ rec {
androidsdk = import ./androidsdk.nix {
inherit (pkgs) stdenv fetchurl unzip makeWrapper;
inherit (pkgs) freetype fontconfig gtk atk;
inherit (pkgs) freetype fontconfig gtk atk mesa;
inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp;
inherit platformTools support platforms sysimages addons;
inherit platformTools buildTools support platforms sysimages addons;
stdenv_32bit = pkgs_i686.stdenv;
zlib_32bit = pkgs_i686.zlib;
@@ -43,6 +48,7 @@ rec {
libXau_32bit = pkgs_i686.xorg.libXau;
libXdmcp_32bit = pkgs_i686.xorg.libXdmcp;
libXext_32bit = pkgs_i686.xorg.libXext;
mesa_32bit = pkgs_i686.mesa;
};
androidsdk_4_1 = androidsdk {