openjdk: Use multiple outputs

This unifies the "openjdk" and "openjre" packages.  The JDK is placed
in the "out" output, the JRE in "jre".

Also, everything is now stored in $prefix/lib/openjdk, so the JDK/JRE
no longer pollute user environments with files like
"ASSEMBLY_EXCEPTION" at top-level.
This commit is contained in:
Eelco Dolstra 2014-01-03 00:25:17 +01:00
parent 7f11ef6345
commit 79675fad6e
2 changed files with 37 additions and 23 deletions

View file

@ -22,7 +22,6 @@
, fontconfig
, cpio
, cacert
, jreOnly ? false
, perl
}:
@ -46,14 +45,14 @@ let
in
stdenv.mkDerivation rec {
name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}";
name = "openjdk-7u${update}b${build}";
src = fetchurl {
url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip;
sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00";
};
# outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
outputs = [ "out" "jre" ];
buildInputs = [
unzip
@ -89,6 +88,8 @@ stdenv.mkDerivation rec {
patches = [ ./cppflags-include-fix.patch ];
NIX_NO_SELF_RPATH = true;
makeFlags = [
"SORT=${coreutils}/bin/sort"
"ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
@ -108,38 +109,53 @@ stdenv.mkDerivation rec {
configurePhase = "true";
installPhase = ''
mkdir -p $out
cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
cp -av build/*/j2sdk-image/* $out/lib/openjdk
# Move some stuff to top-level.
mv $out/lib/openjdk/include $out/include
mv $out/lib/openjdk/man $out/share/man
# Remove some broken manpages.
rm -rf $out/man/ja*
rm -rf $out/share/man/ja*
# Remove crap from the installation.
rm -rf $out/demo $out/sample
rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample
# Move the JRE to a separate output.
mv $out/lib/openjdk/jre $jre/lib/openjdk/
ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre
# Remove duplicate binaries.
for i in $(cd $out/lib/openjdk/bin && echo *); do
if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
fi
done
# Generate certificates.
pushd $out/${if ! jreOnly then "jre/" else ""}lib/security
pushd $jre/lib/openjdk/jre/lib/security
rm cacerts
perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt
perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ca-bundle.crt
popd
ln -s $out/lib/openjdk/bin $out/bin
ln -s $jre/lib/openjdk/jre/bin $jre/bin
'';
# FIXME: this is unnecessary once the multiple-outputs branch is merged.
preFixup = ''
prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
patchELF $jre
propagatedNativeBuildInputs+=" $jre"
'';
# '' + (if jreOnly then "" else ''
# if [ -z $jre ]; then
# exit 0
# fi
# mkdir -p $jre
# cp -av build/*/j2re-image/* $jre
# '');
meta = {
homepage = http://openjdk.java.net/;
license = "GPLv2";
description = "The open-source Java Development Kit";
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.linux;
};

View file

@ -2833,9 +2833,7 @@ let
ant = pkgs.ant.override { jdk = openjdkBootstrap; };
};
openjre = pkgs.openjdk.override {
jreOnly = true;
};
openjre = pkgs.openjdk.jre;
jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
then pkgs.openjdk