Author: shlevy
Date: Thu Aug 11 13:35:20 2011
New Revision: 28494
URL: https://svn.nixos.org/websvn/nix/?rev=28494&sc=1

Log:
openjdk: Comment out the multiple outputs stuff for now

Modified:
   nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix

Modified: nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix        Thu Aug 
11 13:27:43 2011        (r28493)
+++ nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix        Thu Aug 
11 13:35:20 2011        (r28494)
@@ -50,7 +50,7 @@
     sha256 = "17n0i5cgvfsd6ric70h3n7hr8aqnzd216gaq3603wrxlvggzxbp6";
   };
 
-  outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
+#  outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
 
   buildInputs = [
     unzip
@@ -116,13 +116,14 @@
   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/;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to