From e89eab8893073e7743b003b64c0658cf13b9b958 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Nov 2012 16:38:38 +0100
Subject: [PATCH] Make "nix-env -i android-sdk" DTRT

---
 pkgs/development/androidenv/androidsdk.nix | 2 +-
 pkgs/top-level/all-packages.nix            | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/androidenv/androidsdk.nix b/pkgs/development/androidenv/androidsdk.nix
index 535b375231c3..00ccbcd34ef0 100644
--- a/pkgs/development/androidenv/androidsdk.nix
+++ b/pkgs/development/androidenv/androidsdk.nix
@@ -8,7 +8,7 @@
 {platformVersions, useGoogleAPIs}:
 
 stdenv.mkDerivation {
-  name = "android-sdk-linux-20.0.3";
+  name = "android-sdk-20.0.3";
   
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42ba842529ef..d84285f4778e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -407,6 +407,8 @@ let
     pkgs_i686 = pkgsi686Linux;
   };
 
+  inherit (androidenv) androidsdk_4_1;
+
   aria = builderDefsPackage (import ../tools/networking/aria) { };
 
   aria2 = callPackage ../tools/networking/aria2 { };