openjdk: Comment out the multiple outputs stuff for now
svn path=/nixpkgs/trunk/; revision=28494
This commit is contained in:
parent
bff57396f5
commit
b6d81d67d8
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "17n0i5cgvfsd6ric70h3n7hr8aqnzd216gaq3603wrxlvggzxbp6";
|
sha256 = "17n0i5cgvfsd6ric70h3n7hr8aqnzd216gaq3603wrxlvggzxbp6";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
|
# outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
unzip
|
unzip
|
||||||
|
@ -116,13 +116,14 @@ stdenv.mkDerivation rec {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
ensureDir $out
|
ensureDir $out
|
||||||
cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
|
cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
|
||||||
'' + (if jreOnly then "" else ''
|
'';
|
||||||
if [ -z $jre ]; then
|
# '' + (if jreOnly then "" else ''
|
||||||
exit 0
|
# if [ -z $jre ]; then
|
||||||
fi
|
# exit 0
|
||||||
ensureDir $jre
|
# fi
|
||||||
cp -av build/*/j2re-image/* $jre
|
# ensureDir $jre
|
||||||
'');
|
# cp -av build/*/j2re-image/* $jre
|
||||||
|
# '');
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://openjdk.java.net/;
|
homepage = http://openjdk.java.net/;
|
||||||
|
|
Loading…
Reference in New Issue