From b6d81d67d84861578dd85994414f8ce9eced8c4c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 11 Aug 2011 13:35:20 +0000
Subject: [PATCH] openjdk: Comment out the multiple outputs stuff for now

svn path=/nixpkgs/trunk/; revision=28494
---
 pkgs/development/compilers/openjdk/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index cb4d8990258..57f9b754a57 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     sha256 = "17n0i5cgvfsd6ric70h3n7hr8aqnzd216gaq3603wrxlvggzxbp6";
   };
 
-  outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
+#  outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
 
   buildInputs = [
     unzip
@@ -116,13 +116,14 @@ stdenv.mkDerivation rec {
   installPhase = ''
     ensureDir $out
     cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
-  '' + (if jreOnly then "" else ''
-    if [ -z $jre ]; then
-      exit 0
-    fi
-    ensureDir $jre
-    cp -av build/*/j2re-image/* $jre
-  '');
+  '';
+#  '' + (if jreOnly then "" else ''
+#    if [ -z $jre ]; then
+#      exit 0
+#    fi
+#    ensureDir $jre
+#    cp -av build/*/j2re-image/* $jre
+#  '');
 
   meta = {
     homepage = http://openjdk.java.net/;