From 93ddc18a59bec4107a00c2c26ac144fdf68ebd15 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 10 Jun 2015 14:24:23 -0700
Subject: [PATCH] Make jdk / jre derivations installable

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6616c76f9a5..70d38f76e60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3945,23 +3945,28 @@ let
   openjdk7 = callPackage ../development/compilers/openjdk {
     bootjdk = openjdk7-bootstrap;
   };
-  openjdk7_jre = openjdk7.jre;
+  openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; };
+  openjdk7_jre = openjdk7 // { outputs = [ "jre" ]; };
 
   openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix {
     bootjdk = openjdk8-bootstrap;
   };
-  openjdk8_jre = openjdk8.jre;
+  openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; };
+  openjdk8_jre = openjdk8 // { outputs = [ "jre" ]; };
 
   openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
 
-  jdk7 = openjdk7;
-  jre7 = jdk7.jre;
+  java7 = openjdk7;
+  jdk7 = java7 // { outputs = [ "out" ]; };
+  jre7 = java7 // { outputs = [ "jre" ]; };
 
-  jdk8 = openjdk8;
-  jre8 = jdk8.jre;
+  java8 = openjdk8;
+  jdk8 = java8 // { outputs = [ "out" ]; };
+  jre8 = java8 // { outputs = [ "jre" ]; };
 
-  jdk = if stdenv.isDarwin then openjdk-darwin else jdk8;
-  jre = jdk.jre;
+  java = if stdenv.isDarwin then openjdk-darwin else jdk8;
+  jdk = java // { outputs = [ "out" ]; };
+  jre = java // { outputs = [ "jre" ]; };
 
   oraclejdk = pkgs.jdkdistro true false;