1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 693a53cf428c8..d975b5fa8394d 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -4,12 +4,14 @@ rec {
   platformTools = import ./platform-tools.nix {
     inherit (pkgs) stdenv fetchurl unzip;
     stdenv_32bit = pkgs_i686.stdenv;
+    zlib_32bit = pkgs_i686.zlib;
   };
   
   buildTools = import ./build-tools.nix {
     inherit (pkgs) stdenv fetchurl unzip;
     stdenv_32bit = pkgs_i686.stdenv;
     zlib_32bit = pkgs_i686.zlib;
+    ncurses_32bit = pkgs_i686.ncurses;
   };
   
   support = import ./support.nix {
@@ -155,6 +157,20 @@ rec {
     useExtraSupportLibs = true;
     useGooglePlayServices = true;
   };
+  
+  androidsdk_6_0 = androidsdk {
+    platformVersions = [ "23" ];
+    abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
+    useGoogleAPIs = true;
+  };
+
+  androidsdk_6_0_extras = androidsdk {
+    platformVersions = [ "23" ];
+    abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
+    useGoogleAPIs = true;
+    useExtraSupportLibs = true;
+    useGooglePlayServices = true;
+  };
 
   androidndk = import ./androidndk.nix {
     inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;
@@ -167,7 +183,6 @@ rec {
     inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
     inherit platformTools;
   };
-
   
   buildApp = import ./build-app.nix {
     inherit (pkgs) stdenv jdk ant gnumake gawk file which;