From 4e513cbc9fbc0fc0ead6f8f897fcc73d544a62be Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Wed, 28 Dec 2016 20:28:35 +0800
Subject: [PATCH] android-studio: no need for jdk anymore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Android Studio now bundles its own JDK ¯\_(ツ)_/¯
---
 pkgs/applications/editors/android-studio/default.nix |  2 --
 pkgs/top-level/all-packages.nix                      | 11 -----------
 2 files changed, 13 deletions(-)

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