From 2e8feba171b6d8bfec07df9cec5df5e3ee321ced Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 21 Jun 2018 12:12:02 -0400 Subject: [PATCH] androidenv: Use fetchzip instead of googlerepository --- .../mobile/androidenv/androidsdk.nix | 13 ++++++++++--- pkgs/development/mobile/androidenv/default.nix | 6 +----- .../mobile/androidenv/google-repository.nix | 18 ------------------ 3 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/mobile/androidenv/google-repository.nix diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 36ac0b06785..593b38036b7 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,7 +1,6 @@ -{ stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper +{ stdenv, stdenv_32bit, fetchurl, fetchzip, unzip, makeWrapper , platformTools, buildTools, support, supportRepository, platforms, sysimages, addons, sources , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, libGLU_combined, alsaLib -, googleRepository , freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus , zlib, glxinfo, xkeyboardconfig , includeSources @@ -9,7 +8,15 @@ { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false , useGooglePlayServices ? false, useInstantApps ? false }: -let inherit (stdenv.lib) makeLibraryPath; in +let inherit (stdenv.lib) makeLibraryPath; + + googleRepository = let version = "gms_v9_rc41_wear_2_0_rc6"; + in fetchzip rec { + url = "https://dl-ssl.google.com/android/repository/google_m2repository_${version}.zip"; + sha256 = "0k99xmynv0k62d301zx5jnjkddflr51i5lb02l9incg7m5cn8kzx"; + }; + +in stdenv.mkDerivation rec { name = "android-sdk-${version}"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index cb93717861c..21a96c88924 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -23,10 +23,6 @@ rec { inherit (pkgs) stdenv fetchurl unzip; }; - googleRepository = import ./google-repository.nix { - inherit (pkgs) stdenv fetchurl unzip; - }; - platforms = if (pkgs.stdenv.system == "i686-linux" || pkgs.stdenv.system == "x86_64-linux") then import ./platforms-linux.nix { inherit (pkgs) stdenv fetchurl unzip; @@ -54,7 +50,7 @@ rec { inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk libGLU_combined file alsaLib jdk coreutils libpulseaudio dbus; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; - inherit platformTools buildTools support supportRepository googleRepository platforms sysimages addons sources includeSources; + inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources; stdenv_32bit = pkgs_i686.stdenv; }; diff --git a/pkgs/development/mobile/androidenv/google-repository.nix b/pkgs/development/mobile/androidenv/google-repository.nix deleted file mode 100644 index abc1b46c743..00000000000 --- a/pkgs/development/mobile/androidenv/google-repository.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - version = "gms_v9_rc41_wear_2_0_rc6"; - name = "google-repository"; - src = fetchurl { - url = "https://dl-ssl.google.com/android/repository/google_m2repository_${version}.zip"; - sha256 = "0gjmmzkvjp80krbak5nkmkvvs75givqbz0cvw58f6kc7i9jm12nf"; - }; - - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - - buildInputs = [ unzip ]; -}