summary refs log tree commit diff
path: root/pkgs/development/compilers/openjdk
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2011-08-11 13:35:20 +0000
committerShea Levy <shea@shealevy.com>2011-08-11 13:35:20 +0000
commitb6d81d67d84861578dd85994414f8ce9eced8c4c (patch)
treeccbec0c46029b4c4c32f09f3ed843da99b8cbd55 /pkgs/development/compilers/openjdk
parentbff57396f5c339ce8911caab22b3d311aeb47787 (diff)
downloadnixlib-b6d81d67d84861578dd85994414f8ce9eced8c4c.tar
nixlib-b6d81d67d84861578dd85994414f8ce9eced8c4c.tar.gz
nixlib-b6d81d67d84861578dd85994414f8ce9eced8c4c.tar.bz2
nixlib-b6d81d67d84861578dd85994414f8ce9eced8c4c.tar.lz
nixlib-b6d81d67d84861578dd85994414f8ce9eced8c4c.tar.xz
nixlib-b6d81d67d84861578dd85994414f8ce9eced8c4c.tar.zst
nixlib-b6d81d67d84861578dd85994414f8ce9eced8c4c.zip
openjdk: Comment out the multiple outputs stuff for now
svn path=/nixpkgs/trunk/; revision=28494
Diffstat (limited to 'pkgs/development/compilers/openjdk')
-rw-r--r--pkgs/development/compilers/openjdk/default.nix17
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index cb4d8990258f..57f9b754a572 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/;