From ef490c6b14a7394744ce333a0f6f5f1cc7b6e5a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Sep 2015 19:21:28 +0200
Subject: Make the "openjdk7" attribute work on Darwin

---
 pkgs/top-level/all-packages.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 484855cfd5a8..5912643c94a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4135,17 +4135,19 @@ let
 
   path64 = callPackage ../development/compilers/path64 { };
 
-  openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { };
-
-  openjdk7 = callPackage ../development/compilers/openjdk/7.nix {
-    bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
-  };
+  openjdk7 =
+    if stdenv.isDarwin then
+      callPackage ../development/compilers/openjdk-darwin { }
+    else
+      callPackage ../development/compilers/openjdk/7.nix {
+        bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
+      };
 
   openjdk8 = callPackage ../development/compilers/openjdk/8.nix {
     bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
   };
 
-  openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
+  openjdk = if stdenv.isDarwin then openjdk7 else openjdk8;
 
   jdk7 = openjdk7 // { outputs = [ "out" ]; };
   jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (openjdk7.jre // { outputs = [ "jre" ]; });
-- 
cgit 1.4.1