diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 45054a3577db..fef41d33d080 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
+{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor
, libjpeg, giflib
@@ -75,11 +75,14 @@ let
gtk2 gnome_vfs GConf glib
];
+ #move the seven other source dirs under the main jdk8u directory,
+ #with version suffixes removed, as the remainder of the build will expect
prePatch = ''
- ls | grep jdk | grep -v '^jdk8u' | awk -F- '{print $1}' | while read p; do
- mv $p-* $(ls | grep '^jdk8u')/$p
+ mainDir=$(find . -maxdepth 1 -name jdk8u\*);
+ find . -maxdepth 1 -name \*jdk\* -not -name jdk8u\* | awk -F- '{print $1}' | while read p; do
+ mv $p-* $mainDir/$p
done
- cd $(ls | grep '^jdk8u')
+ cd $mainDir
'';
patches = [
@@ -95,7 +98,7 @@ let
preConfigure = ''
chmod +x configure
- substituteInPlace configure --replace /bin/bash "$shell"
+ substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell"
substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
''
@@ -188,10 +191,11 @@ let
done
# Generate certificates.
- pushd $jre/lib/openjdk/jre/lib/security
- rm cacerts
- perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
- popd
+ (
+ cd $jre/lib/openjdk/jre/lib/security
+ rm cacerts
+ perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
+ )
ln -s $out/lib/openjdk/bin $out/bin
ln -s $jre/lib/openjdk/jre/bin $jre/bin
@@ -221,13 +225,13 @@ let
# Build the set of output library directories to rpath against
LIBDIRS=""
for output in $outputs; do
- LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':'):$LIBDIRS"
+ LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
done
# Add the local library paths to remove dependencies on the bootstrap
for output in $outputs; do
- OUTPUTDIR="$(eval echo \$$output)"
- BINLIBS="$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)"
+ OUTPUTDIR=$(eval echo \$$output)
+ BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
echo "$BINLIBS" | while read i; do
patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
patchelf --shrink-rpath "$i" || true
diff --git a/pkgs/development/compilers/openjdk/9.nix b/pkgs/development/compilers/openjdk/9.nix
new file mode 100644
index 000000000000..65ef6ec5f2eb
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/9.nix
@@ -0,0 +1,258 @@
+{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
+, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir
+, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor
+, libjpeg, giflib
+, setJavaClassPath
+, minimal ? false
+#, enableInfinality ? true # font rendering patch
+, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
+}:
+
+let
+
+ /**
+ * The JRE libraries are in directories that depend on the CPU.
+ */
+ architecture =
+ if stdenv.system == "i686-linux" then
+ "i386"
+ else if stdenv.system == "x86_64-linux" then
+ "amd64"
+ else
+ throw "openjdk requires i686-linux or x86_64 linux";
+
+ update = "";
+ build = "180";
+ baseurl = "http://hg.openjdk.java.net/jdk9/jdk9";
+ repover = "jdk-9${update}+${build}";
+ paxflags = if stdenv.isi686 then "msp" else "m";
+ jdk9 = fetchurl {
+ url = "${baseurl}/archive/${repover}.tar.gz";
+ sha256 = "05f3i6p35nh4lwh17znkmwbb8ccw1hl1qs5hnqivpph27lpdpqnn";
+ };
+ langtools = fetchurl {
+ url = "${baseurl}/langtools/archive/${repover}.tar.gz";
+ sha256 = "0gpgg0mz29jvfck6p6kqqyi3b9lx3d4s3h0dnriswmjnw0dy3bc6";
+ };
+ hotspot = fetchurl {
+ url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
+ sha256 = "1zb0pzfgnykpllm9ibwqqrzhbsxdxq1cj5rdmd5h51qjfzd8k3js";
+ };
+ corba = fetchurl {
+ url = "${baseurl}/corba/archive/${repover}.tar.gz";
+ sha256 = "1rv4gcidr0b71d7wkchx4g3gxkirpg98y0mlicqaah1vmvx3knkp";
+ };
+ jdk = fetchurl {
+ url = "${baseurl}/jdk/archive/${repover}.tar.gz";
+ sha256 = "1g3dwszz7v8812fp53vpsbmd5ingzwym8kwz4iq45bf0d1df95x9";
+ };
+ jaxws = fetchurl {
+ url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
+ sha256 = "0f7vblr4c322rvjgaim8lp91s9gkf1sf31mgzhl433h5m5hs5z26";
+ };
+ jaxp = fetchurl {
+ url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
+ sha256 = "1c552q4360aqfr8h6720ckk8sn4fw8c5nix5gc826sj4vrk7gqz2";
+ };
+ nashorn = fetchurl {
+ url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
+ sha256 = "1hi9152w94gkwypj32nlxzp7ryzc04pp72qvr4z9m2vdc85hglhc";
+ };
+ openjdk9 = stdenv.mkDerivation {
+ # name = "openjdk-9u${update}b${build}";
+ name = "openjdk-9ea-b${build}";
+
+ srcs = [ jdk9 langtools hotspot corba jdk jaxws jaxp nashorn ];
+ sourceRoot = ".";
+
+ outputs = [ "out" "jre" ];
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [
+ cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
+ libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
+ libXi libXinerama libXcursor lndir fontconfig
+ ] ++ lib.optionals (!minimal && enableGnome2) [
+ gtk2 gnome_vfs GConf glib
+ ];
+
+ #move the seven other source dirs under the main jdk8u directory,
+ #with version suffixes removed, as the remainder of the build will expect
+ prePatch = ''
+ mainDir=$(find . -maxdepth 1 -name jdk9\*);
+ find . -maxdepth 1 -name \*jdk\* -not -name jdk9\* | awk -F- '{print $1}' | while read p; do
+ mv $p-* $mainDir/$p
+ done
+ cd $mainDir
+ '';
+
+ patches = [
+ ./fix-java-home-jdk9.patch
+ ./read-truststore-from-env-jdk9.patch
+ ./currency-date-range-jdk8.patch
+ #] ++ lib.optionals (!minimal && enableInfinality) [
+ # ./004_add-fontconfig.patch
+ # ./005_enable-infinality.patch
+ ] ++ lib.optionals (!minimal && enableGnome2) [
+ ./swing-use-gtk-jdk9.patch
+ ];
+
+ preConfigure = ''
+ chmod +x configure
+ substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
+
+ configureFlagsArray=(
+ "--with-boot-jdk=${bootjdk.home}"
+ "--with-update-version=${update}"
+ "--with-build-number=${build}"
+ "--with-milestone=fcs"
+ "--enable-unlimited-crypto"
+ "--disable-debug-symbols"
+ "--disable-freetype-bundling"
+ "--with-zlib=system"
+ "--with-giflib=system"
+ "--with-stdc++lib=dynamic"
+
+ # glibc 2.24 deprecated readdir_r so we need this
+ # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
+ "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result"
+ ''
+ + lib.optionalString minimal "\"--enable-headless-only\""
+ + ");";
+
+ NIX_LDFLAGS= lib.optionals (!minimal) [
+ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
+ ] ++ lib.optionals (!minimal && enableGnome2) [
+ "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+ ];
+
+ buildFlags = [ "all" ];
+
+ installPhase = ''
+ mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
+
+ cp -av build/*/images/jdk/* $out/lib/openjdk
+
+ # Remove some broken manpages.
+ rm -rf $out/lib/openjdk/man/ja*
+
+ # Mirror some stuff in top-level.
+ mkdir $out/include $out/share/man
+ ln -s $out/lib/openjdk/include/* $out/include/
+ ln -s $out/lib/openjdk/man/* $out/share/man/
+
+ # jni.h expects jni_md.h to be in the header search path.
+ ln -s $out/include/linux/*_md.h $out/include/
+
+ # Copy the JRE to a separate output and setup fallback fonts
+ cp -av build/*/images/jre $jre/lib/openjdk/
+ mkdir $out/lib/openjdk/jre
+ ${lib.optionalString (!minimal) ''
+ mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback
+ lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
+ ''}
+
+ # Remove crap from the installation.
+ rm -rf $out/lib/openjdk/demo
+ ${lib.optionalString minimal ''
+ for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do
+ rm ''${d}/{libjsound,libjsoundalsa,libawt*,libfontmanager}.so
+ done
+ ''}
+
+ lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
+
+ # Make sure cmm/*.pf are not symlinks:
+ # https://youtrack.jetbrains.com/issue/IDEA-147272
+ # in 9, it seems no *.pf files end up in $out ... ?
+ # rm -rf $out/lib/openjdk/jre/lib/cmm
+ # ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
+
+ # Set PaX markings
+ exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+ echo "to mark: *$exes*"
+ for file in $exes; do
+ echo "marking *$file*"
+ paxmark ${paxflags} "$file"
+ done
+
+ # Remove duplicate binaries.
+ for i in $(cd $out/lib/openjdk/bin && echo *); do
+ if [ "$i" = java ]; then continue; fi
+ 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.
+ (
+ cd $jre/lib/openjdk/jre/lib/security
+ rm cacerts
+ perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
+ )
+
+ ln -s $out/lib/openjdk/bin $out/bin
+ ln -s $jre/lib/openjdk/jre/bin $jre/bin
+ ln -s $jre/lib/openjdk/jre $out/jre
+ '';
+
+ # 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
+ #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
+ 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 [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+ EOF
+ '';
+
+ postFixup = ''
+ # Build the set of output library directories to rpath against
+ LIBDIRS=""
+ for output in $outputs; do
+ LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
+ done
+
+ # Add the local library paths to remove dependencies on the bootstrap
+ for output in $outputs; do
+ OUTPUTDIR=$(eval echo \$$output)
+ BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
+ echo "$BINLIBS" | while read i; do
+ patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
+ patchelf --shrink-rpath "$i" || true
+ done
+ done
+
+ # Test to make sure that we don't depend on the bootstrap
+ for output in $outputs; do
+ if grep -q -r '${bootjdk}' $(eval echo \$$output); then
+ echo "Extraneous references to ${bootjdk} detected"
+ exit 1
+ fi
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://openjdk.java.net/;
+ license = licenses.gpl2;
+ description = "The open-source Java Development Kit";
+ maintainers = with maintainers; [ edwtjo ];
+ platforms = platforms.linux;
+ };
+
+ passthru = {
+ inherit architecture;
+ home = "${openjdk9}/lib/openjdk";
+ };
+ };
+in openjdk9
diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk9.patch b/pkgs/development/compilers/openjdk/fix-java-home-jdk9.patch
new file mode 100644
index 000000000000..f9755d58e48f
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/fix-java-home-jdk9.patch
@@ -0,0 +1,14 @@
+--- a/hotspot/src/os/linux/vm/os_linux.cpp 2017-07-04 23:09:02.533972226 -0400
++++ b/hotspot/src/os/linux/vm/os_linux.cpp 2017-07-04 23:07:52.118338845 -0400
+@@ -2318,10 +2318,7 @@
+ assert(ret, "cannot locate libjvm");
+ char *rp = NULL;
+ if (ret && dli_fname[0] != '\0') {
+- rp = realpath(dli_fname, buf);
+- }
+- if (rp == NULL) {
+- return;
++ snprintf(buf, buflen, "%s", dli_fname);
+ }
+
+ if (Arguments::sun_java_launcher_is_altjvm()) {
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk9.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk9.patch
new file mode 100644
index 000000000000..cb8d59ff8063
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk9.patch
@@ -0,0 +1,20 @@
+--- a/jdk/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400
++++ b/jdk/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java.new 2017-07-05 20:45:57.491295030 -0400
+@@ -71,6 +71,7 @@
+ *
+ * The preference of the default trusted KeyStore is:
+ * javax.net.ssl.trustStore
++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE
+ * jssecacerts
+ * cacerts
+ */
+@@ -144,6 +145,9 @@
+ String temporaryName = "";
+ File temporaryFile = null;
+ long temporaryTime = 0L;
++ if (storePropName == null){
++ storePropName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE");
++ }
+ if (!"NONE".equals(storePropName)) {
+ String[] fileNames =
+ new String[] {storePropName, defaultStore};
diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk9.patch b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk9.patch
new file mode 100644
index 000000000000..07d95ba71b8a
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk9.patch
@@ -0,0 +1,26 @@
+diff -ru3 a/jdk/src/share/classes/javax/swing/UIManager.java b/jdk/src/share/classes/javax/swing/UIManager.java
+--- a/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java 2016-07-26 00:41:37.000000000 +0300
++++ b/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java 2016-10-02 22:46:01.890071761 +0300
+@@ -607,11 +607,9 @@
+ if (osType == OSInfo.OSType.WINDOWS) {
+ return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
+ } else {
+- String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop"));
+ Toolkit toolkit = Toolkit.getDefaultToolkit();
+- if ("gnome".equals(desktop) &&
+- toolkit instanceof SunToolkit &&
+- ((SunToolkit) toolkit).isNativeGTKAvailable()) {
++ if (toolkit instanceof SunToolkit &&
++ ((SunToolkit) toolkit).isNativeGTKAvailable()) {
+ // May be set on Linux and Solaris boxs.
+ return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
+ }
+@@ -1341,7 +1339,7 @@
+ lafName = (String) lafData.remove("defaultlaf");
+ }
+ if (lafName == null) {
+- lafName = getCrossPlatformLookAndFeelClassName();
++ lafName = getSystemLookAndFeelClassName();
+ }
+ lafName = swingProps.getProperty(defaultLAFKey, lafName);
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 924a5e8d7e0d..6bffd358b180 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5826,6 +5826,15 @@ with pkgs;
inherit (gnome2) GConf gnome_vfs;
};
+ openjdk9 =
+ if stdenv.isDarwin then
+ callPackage ../development/compilers/openjdk-darwin/9.nix { }
+ else
+ callPackage ../development/compilers/openjdk/9.nix {
+ bootjdk = openjdk8;
+ inherit (gnome2) GConf gnome_vfs;
+ };
+
openjdk = openjdk8;
jdk7 = openjdk7 // { outputs = [ "out" ]; };
@@ -5843,6 +5852,16 @@ with pkgs;
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
+ jdk9 = openjdk9 // { outputs = [ "out" ]; };
+ jre9 = lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}"
+ (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
+ (openjdk9.jre // { outputs = [ "jre" ]; }));
+ jre9_headless =
+ if stdenv.isDarwin then jre9 else
+ lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}-headless"
+ (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
+ ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
+
jdk = jdk8;
jre = jre8;
jre_headless = jre8_headless;