From 02f7e85d9993b40b6578ed30550dca9ea0bd745a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Jan 2014 14:45:35 +0100 Subject: openjdk: Remove obsolete header file hack --- pkgs/development/compilers/openjdk/default.nix | 3 --- 1 file changed, 3 deletions(-) (limited to 'pkgs/development/compilers/openjdk/default.nix') diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index fd229cf5b139..d4d7927890c0 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -85,9 +85,6 @@ 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@@@" \ - openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c ''; patches = [ ./cppflags-include-fix.patch ]; -- cgit 1.4.1 From 7edfe92f5fd7c58126f2b73e979a976b09afe31e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Jan 2014 15:16:47 +0100 Subject: openjdk: Fix manpage cleanup --- pkgs/development/compilers/openjdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/compilers/openjdk/default.nix') diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index d4d7927890c0..80a607262e1a 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out # Remove some broken manpages. - rm -rf $out/share/man/ja* + rm -rf $out/man/ja* # Remove crap from the installation. rm -rf $out/demo $out/sample -- cgit 1.4.1 From 7f11ef63458b88d8e41395db40fda3989545b0cf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Jan 2014 19:43:07 +0100 Subject: openjdk: Skip configurePhase The build phase also runs "make sanity", so there is no need to do it twice. --- pkgs/development/compilers/openjdk/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/development/compilers/openjdk/default.nix') diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 80a607262e1a..4639214b5e9f 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -105,9 +105,7 @@ stdenv.mkDerivation rec { "UNLIMITED_CRYPTO=1" ]; - configurePhase = '' - make $makeFlags sanity - ''; + configurePhase = "true"; installPhase = '' mkdir -p $out -- cgit 1.4.1 From 79675fad6ed991f6184f5c29960ca993e3439907 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Jan 2014 00:25:17 +0100 Subject: 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. --- pkgs/development/compilers/openjdk/default.nix | 56 +++++++++++++++++--------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 37 insertions(+), 23 deletions(-) (limited to 'pkgs/development/compilers/openjdk/default.nix') diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 4639214b5e9f..c451d680beac 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -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; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90f98cab65dd..a3683fecc109 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 -- cgit 1.4.1 From 90e533b6858a47deecff9fda027985dc68a7ac02 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 6 Jan 2014 14:14:43 +0100 Subject: openjre: Propagate setJavaClassPath Thus, any package that has the JRE or JDK in its build inputs will automatically have $CLASSPATH set up properly. --- pkgs/development/compilers/openjdk/default.nix | 60 ++++++-------------------- 1 file changed, 14 insertions(+), 46 deletions(-) (limited to 'pkgs/development/compilers/openjdk/default.nix') diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index c451d680beac..234f294eff3e 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,29 +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 -, 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 @@ -54,26 +31,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "jre" ]; - buildInputs = [ - unzip - procps - ant - which - zip - cpio - nettools - alsaLib - libX11 - libXt - libXext - libXrender - libXtst - libXi - libXinerama - libXcursor - fontconfig - perl - ]; + buildInputs = + [ unzip procps ant which zip cpio nettools alsaLib + libX11 libXt libXext libXrender libXtst libXi libXinerama libXcursor + fontconfig perl + ]; NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama"; @@ -149,6 +111,12 @@ stdenv.mkDerivation rec { 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 ''; meta = { -- cgit 1.4.1 From 4775dee8b9bca7382240935e5cef219c28b8cf0b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Jan 2014 12:50:38 +0100 Subject: openjdk: Set JAVA_HOME in a setup-hook --- pkgs/development/compilers/openjdk/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs/development/compilers/openjdk/default.nix') diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 234f294eff3e..b99139c0e3fe 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { 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 = '' @@ -117,6 +117,12 @@ stdenv.mkDerivation rec { # 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 < $out/nix-support/setup-hook + if [ -n "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF ''; meta = { -- cgit 1.4.1