diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2e14ae339cf7..eb2d27c61399 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,7 +9,6 @@ , gnugrep , gnutar , gzip -, jdk , fontconfig , freetype , libpulseaudio @@ -50,7 +49,6 @@ let coreutils findutils gnugrep - jdk which # For Android emulator diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52e4194fab1d..0f2f9186562c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };