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

android-studio: no need for jdk anymore

Browse Source 
Android Studio now bundles its own JDK ¯\_(ツ)_/¯
This commit is contained in:
Hoang Xuan Phu 2016-12-28 20:28:35 +08:00
parent 7ee897a3b3
commit 4e513cbc9f
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/android-studio/default.nix
View File

@ -9,7 +9,6 @@
, gnugrep , gnugrep
, gnutar , gnutar
, gzip , gzip
, jdk
, fontconfig , fontconfig
, freetype , freetype
, libpulseaudio , libpulseaudio
@ -50,7 +49,6 @@ let
coreutils coreutils
findutils findutils
gnugrep gnugrep
jdk
which which
# For Android emulator # For Android emulator

11
pkgs/top-level/all-packages.nix
View File

@ -12322,17 +12322,6 @@ in
amsn = callPackage ../applications/networking/instant-messengers/amsn { }; amsn = callPackage ../applications/networking/instant-messengers/amsn { };
# Oracle JDK is recommended upstream, but unfree and requires a manual
# download. OpenJDK is straightforward, but may suffer from compatibility
# problems e.g. https://code.google.com/p/android/issues/detail?id=174496.
# To use Oracle JDK add an override to ~/.nixpkgs/config.nix:
# {
# packageOverrides = pkgs: {
# android-studio = pkgs.android-studio.override {
# jdk = pkgs.oraclejdk8;
# };
# };
# }
android-studio = callPackage ../applications/editors/android-studio { android-studio = callPackage ../applications/editors/android-studio {
inherit (xorg) libX11 libXext libXi libXrandr libXrender libXtst; inherit (xorg) libX11 libXext libXi libXrandr libXrender libXtst;
}; };