about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorSander van der Burg <svanderburg@gmail.com>2012-11-07 21:10:39 +0100
committerSander van der Burg <svanderburg@gmail.com>2012-11-07 21:10:39 +0100
commit3afa95bfbae56f914b40527500b2b010ba9c3b90 (patch)
tree0ef22a0aeb9da0a69132f79bfb66becbdebd6bd0 /pkgs/top-level
parent7afafe0b6dd019851ae0919e11fcee9d035e5698 (diff)
downloadnixlib-3afa95bfbae56f914b40527500b2b010ba9c3b90.tar
nixlib-3afa95bfbae56f914b40527500b2b010ba9c3b90.tar.gz
nixlib-3afa95bfbae56f914b40527500b2b010ba9c3b90.tar.bz2
nixlib-3afa95bfbae56f914b40527500b2b010ba9c3b90.tar.lz
nixlib-3afa95bfbae56f914b40527500b2b010ba9c3b90.tar.xz
nixlib-3afa95bfbae56f914b40527500b2b010ba9c3b90.tar.zst
nixlib-3afa95bfbae56f914b40527500b2b010ba9c3b90.zip
Added androidenv - the Android SDK, their additions and two functions that build and emulate Android Apps
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ac83442fdb9..cfd1adcf2290 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -402,6 +402,11 @@ let
     client = true;
   });
 
+  androidenv = import ../development/androidenv {
+    inherit pkgs;
+    pkgs_i686 = pkgsi686Linux;
+  };
+
   aria = builderDefsPackage (import ../tools/networking/aria) { };
 
   aria2 = callPackage ../tools/networking/aria2 { };