android-studio: no need for jdk anymore
Android Studio now bundles its own JDK ¯\_(ツ)_/¯
This commit is contained in:
parent
7ee897a3b3
commit
4e513cbc9f
@ -9,7 +9,6 @@
|
||||
, gnugrep
|
||||
, gnutar
|
||||
, gzip
|
||||
, jdk
|
||||
, fontconfig
|
||||
, freetype
|
||||
, libpulseaudio
|
||||
@ -50,7 +49,6 @@ let
|
||||
coreutils
|
||||
findutils
|
||||
gnugrep
|
||||
jdk
|
||||
which
|
||||
|
||||
# For Android emulator
|
||||
|
@ -12322,17 +12322,6 @@ in
|
||||
|
||||
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 {
|
||||
inherit (xorg) libX11 libXext libXi libXrandr libXrender libXtst;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user