diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-13 13:16:17 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-13 13:16:17 +0100 |
commit | 6fb27abf3330139b7f5a868ae988fcf04284a1ca (patch) | |
tree | 4e5772e2bf7b785413ea69d15deb38e53925cf6e /pkgs/development/compilers/openjdk/default.nix | |
parent | 78d3180dbe8896500a35a848675462aeafe6f1b9 (diff) | |
parent | cf4acab5670e9c04cbd924ad0835ba5a5219b296 (diff) | |
download | nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.gz nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.bz2 nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.lz nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.xz nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.zst nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.zip |
Merge branch 'java'
Diffstat (limited to 'pkgs/development/compilers/openjdk/default.nix')
-rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 129 |
1 files changed, 57 insertions, 72 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index fd229cf5b139..b99139c0e3fe 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,30 +1,6 @@ -{ stdenv -, fetchurl -, unzip -, zip -, procps -, coreutils -, alsaLib -, ant -, freetype -, cups -, which -, jdk -, nettools -, libX11 -, libXt -, libXext -, libXrender -, libXtst -, libXi -, libXinerama -, libXcursor -, fontconfig -, cpio -, cacert -, jreOnly ? false -, perl -}: +{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype, cups +, which, jdk, nettools, libX11, libXt, libXext, libXrender, libXtst, libXi, libXinerama +, libXcursor, fontconfig, cpio, cacert, perl, setJavaClassPath }: let @@ -46,35 +22,20 @@ 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" ]; - - buildInputs = [ - unzip - procps - ant - which - zip - cpio - nettools - alsaLib - libX11 - libXt - libXext - libXrender - libXtst - libXi - libXinerama - libXcursor - fontconfig - perl - ]; + outputs = [ "out" "jre" ]; + + buildInputs = + [ unzip procps ant which zip cpio nettools alsaLib + libX11 libXt libXext libXrender libXtst libXi libXinerama libXcursor + fontconfig perl + ]; NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama"; @@ -85,13 +46,12 @@ stdenv.mkDerivation rec { sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk - - sed -i "s@<Xrender.h>@<X11/extensions/Xrender.h>@" \ - openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c ''; patches = [ ./cppflags-include-fix.patch ]; + NIX_NO_SELF_RPATH = true; + makeFlags = [ "SORT=${coreutils}/bin/sort" "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h" @@ -108,43 +68,68 @@ stdenv.mkDerivation rec { "UNLIMITED_CRYPTO=1" ]; - configurePhase = '' - make $makeFlags sanity - ''; + 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/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" + + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + mkdir -p $jre/nix-support + echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -n "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF ''; -# '' + (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; }; |