public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

androidenv: Use fetchzip instead of googlerepository

Browse Source
This commit is contained in:
Matthew Bauer
2018-06-21 12:12:02 -04:00
parent fe04fe868b
commit 2e8feba171
3 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/mobile/androidenv/default.nix
View File

@@ -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;
};