diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2013-07-31 16:00:57 +0200 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2013-07-31 16:00:57 +0200 |
| commit | ab9be1b809c63b92c8ebb5723bf8f331c4bb9775 (patch) | |
| tree | 305490e6c9ab378aae4355fc6a77e92826e1322a /pkgs/development/mobile/androidenv/default.nix | |
| parent | b6d43bb6a3aa7a5ae15d22b1a518fa773edf288e (diff) | |
| download | nixlib-ab9be1b809c63b92c8ebb5723bf8f331c4bb9775.tar nixlib-ab9be1b809c63b92c8ebb5723bf8f331c4bb9775.tar.gz nixlib-ab9be1b809c63b92c8ebb5723bf8f331c4bb9775.tar.bz2 nixlib-ab9be1b809c63b92c8ebb5723bf8f331c4bb9775.tar.lz nixlib-ab9be1b809c63b92c8ebb5723bf8f331c4bb9775.tar.xz nixlib-ab9be1b809c63b92c8ebb5723bf8f331c4bb9775.tar.zst nixlib-ab9be1b809c63b92c8ebb5723bf8f331c4bb9775.zip | |
Updated Android SDK to version 22.05, updated all plugins, and added mesa to the search path of the emulators to enable OpenGL acceleration
Diffstat (limited to 'pkgs/development/mobile/androidenv/default.nix')
| -rw-r--r-- | pkgs/development/mobile/androidenv/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index a76deb98b6ee..2191a0953bf4 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -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 { |