3
0
Fork 0
forked from mirrors/nixpkgs

openjdk: Comment out the multiple outputs stuff for now

svn path=/nixpkgs/trunk/; revision=28494
This commit is contained in:
Shea Levy 2011-08-11 13:35:20 +00:00
parent bff57396f5
commit b6d81d67d8

View file

@ -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/;