From ccf7640a4b39a11f8c7f8000536588c48f377ab8 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Mar 2017 23:28:45 -0500
Subject: [PATCH] openjdk: stop defaulting Darwin to version 7

Let's just be consistent with 8. At some point we'll get a proper build
of it from source but until then we might as well standardize on 8, which
has been out for years now and seems to work fine on Darwin.
---
 pkgs/top-level/all-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97c8741d6fa6..f4e5dad15b15 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5230,7 +5230,7 @@ with pkgs;
         inherit (gnome2) GConf gnome_vfs;
       };
 
-  openjdk = if stdenv.isDarwin then openjdk7 else openjdk8;
+  openjdk = openjdk8;
 
   jdk7 = openjdk7 // { outputs = [ "out" ]; };
   jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}"
@@ -5247,9 +5247,9 @@ with pkgs;
         (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
           ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
 
-  jdk = if stdenv.isDarwin then jdk7 else jdk8;
-  jre = if stdenv.isDarwin then jre7 else jre8;
-  jre_headless = if stdenv.isDarwin then jre7 else jre8_headless;
+  jdk = jdk8;
+  jre = jre8;
+  jre_headless = jre8_headless;
 
   openshot-qt = callPackage ../applications/video/openshot-qt { };