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

androidenv: Clean up whitespace

Browse Source
This commit is contained in:
John Ericson 2018-02-20 21:34:29 -05:00
parent 1c00a8afd7
commit fe5ae8b550
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ rec {
platformTools = import ./platform-tools.nix { platformTools = import ./platform-tools.nix {
inherit (pkgs) stdenv fetchurl unzip zlib; inherit (pkgs) stdenv fetchurl unzip zlib;
}; };
buildTools = import ./build-tools.nix { buildTools = import ./build-tools.nix {
inherit (pkgs) stdenv fetchurl unzip zlib file; inherit (pkgs) stdenv fetchurl unzip zlib file;
stdenv_32bit = pkgs_i686.stdenv; stdenv_32bit = pkgs_i686.stdenv;
@ -12,11 +12,11 @@ rec {
ncurses_32bit = pkgs_i686.ncurses5; ncurses_32bit = pkgs_i686.ncurses5;
ncurses = pkgs.ncurses5; ncurses = pkgs.ncurses5;
}; };
support = import ./support.nix { support = import ./support.nix {
inherit (pkgs) stdenv fetchurl unzip; inherit (pkgs) stdenv fetchurl unzip;
}; };
supportRepository = import ./support-repository.nix { supportRepository = import ./support-repository.nix {
inherit (pkgs) stdenv fetchurl unzip; inherit (pkgs) stdenv fetchurl unzip;
}; };
@ -47,18 +47,18 @@ rec {
inherit (pkgs) stdenv fetchurl unzip makeWrapper; inherit (pkgs) stdenv fetchurl unzip makeWrapper;
inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk mesa file alsaLib jdk coreutils libpulseaudio dbus; inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk mesa file alsaLib jdk coreutils libpulseaudio dbus;
inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig;
inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources; inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources;
stdenv_32bit = pkgs_i686.stdenv; stdenv_32bit = pkgs_i686.stdenv;
}; };
androidsdk_2_1 = androidsdk { androidsdk_2_1 = androidsdk {
platformVersions = [ "7" ]; platformVersions = [ "7" ];
abiVersions = [ "armeabi-v7a" ]; abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true; useGoogleAPIs = true;
}; };
androidsdk_2_2 = androidsdk { androidsdk_2_2 = androidsdk {
platformVersions = [ "8" ]; platformVersions = [ "8" ];
abiVersions = [ "armeabi-v7a" ]; abiVersions = [ "armeabi-v7a" ];
@ -70,49 +70,49 @@ rec {
abiVersions = [ "armeabi-v7a" ]; abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true; useGoogleAPIs = true;
}; };
androidsdk_3_0 = androidsdk { androidsdk_3_0 = androidsdk {
platformVersions = [ "11" ]; platformVersions = [ "11" ];
abiVersions = [ "armeabi-v7a" ]; abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true; useGoogleAPIs = true;
}; };
androidsdk_3_1 = androidsdk { androidsdk_3_1 = androidsdk {
platformVersions = [ "12" ]; platformVersions = [ "12" ];
abiVersions = [ "armeabi-v7a" ]; abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true; useGoogleAPIs = true;
}; };
androidsdk_3_2 = androidsdk { androidsdk_3_2 = androidsdk {
platformVersions = [ "13" ]; platformVersions = [ "13" ];
abiVersions = [ "armeabi-v7a" ]; abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true; useGoogleAPIs = true;
}; };
androidsdk_4_0 = androidsdk { androidsdk_4_0 = androidsdk {
platformVersions = [ "14" ]; platformVersions = [ "14" ];
abiVersions = [ "armeabi-v7a" ]; abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true; useGoogleAPIs = true;
}; };
androidsdk_4_0_3 = androidsdk { androidsdk_4_0_3 = androidsdk {
platformVersions = [ "15" ]; platformVersions = [ "15" ];
abiVersions = [ "armeabi-v7a" ]; abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true; useGoogleAPIs = true;
}; };
androidsdk_4_1 = androidsdk { androidsdk_4_1 = androidsdk {
platformVersions = [ "16" ]; platformVersions = [ "16" ];
abiVersions = [ "armeabi-v7a" ]; abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true; useGoogleAPIs = true;
}; };
androidsdk_4_2 = androidsdk { androidsdk_4_2 = androidsdk {
platformVersions = [ "17" ]; platformVersions = [ "17" ];
abiVersions = [ "armeabi-v7a" ]; abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true; useGoogleAPIs = true;
}; };
androidsdk_4_3 = androidsdk { androidsdk_4_3 = androidsdk {
platformVersions = [ "18" ]; platformVersions = [ "18" ];
abiVersions = [ "armeabi-v7a" "x86" ]; abiVersions = [ "armeabi-v7a" "x86" ];
@ -152,7 +152,7 @@ rec {
useExtraSupportLibs = true; useExtraSupportLibs = true;
useGooglePlayServices = true; useGooglePlayServices = true;
}; };
androidsdk_6_0 = androidsdk { androidsdk_6_0 = androidsdk {
platformVersions = [ "23" ]; platformVersions = [ "23" ];
abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
@ -224,12 +224,12 @@ rec {
inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
inherit platformTools; inherit platformTools;
}; };
buildApp = import ./build-app.nix { buildApp = import ./build-app.nix {
inherit (pkgs) stdenv jdk ant gnumake gawk file which; inherit (pkgs) stdenv jdk ant gnumake gawk file which;
inherit androidsdk androidndk; inherit androidsdk androidndk;
}; };
emulateApp = import ./emulate-app.nix { emulateApp = import ./emulate-app.nix {
inherit (pkgs) stdenv; inherit (pkgs) stdenv;
inherit androidsdk; inherit androidsdk;