Now x86 and mips images from external repositories are supported + added GPU option to the emulate function

1 files changed, 1 insertions, 17 deletions

diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
index 6036595eb9ac..be9947d536a9 100644
--- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl
+++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
@@ -7,22 +7,8 @@
   <xsl:output omit-xml-declaration="yes" indent="no" />
 
   <xsl:template match="/sdk:sdk-repository">
-{stdenv, fetchurl, unzip}:
-
-let
-  buildSystemImage = args:
-    stdenv.mkDerivation (args // {   
-      buildInputs = [ unzip ];
-      buildCommand = ''
-        mkdir -p $out
-        cd $out
-        unzip $src
-    '';
-  });
-in
-{
     <xsl:for-each select="sdk:system-image">
-  sysimg_<xsl:value-of select="sdk:api-level" /> = buildSystemImage {
+  sysimg_<xsl:value-of select="sdk:abi" />_<xsl:value-of select="sdk:api-level" /> = buildSystemImage {
     name = "<xsl:value-of select="sdk:abi" />-<xsl:value-of select="sdk:api-level" />";
     src = fetchurl {
       url = https://dl-ssl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:url" />;
@@ -30,7 +16,5 @@ in
     };
   };
     </xsl:for-each>
-}
   </xsl:template>
-
 </xsl:stylesheet>