Matt McHenry
5 years ago
parent
d9d5b737ee
commit
d00559ebb8
@ -0,0 +1,155 @@ |
||||
{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip |
||||
, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 |
||||
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama |
||||
, libXcursor, libXrandr, fontconfig, openjdk11 |
||||
, setJavaClassPath |
||||
, headless ? false |
||||
, enableJavaFX ? openjfx.meta.available, openjfx |
||||
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf |
||||
}: |
||||
|
||||
let |
||||
major = "12"; |
||||
update = ".0.2"; |
||||
build = "ga"; |
||||
|
||||
openjdk = stdenv.mkDerivation rec { |
||||
pname = "openjdk" + lib.optionalString headless "-headless"; |
||||
version = "${major}${update}-${build}"; |
||||
|
||||
src = fetchurl { |
||||
url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; |
||||
sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf ]; |
||||
buildInputs = [ |
||||
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib |
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst |
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk11 |
||||
] ++ lib.optionals (!headless && enableGnome2) [ |
||||
gtk3 gnome_vfs GConf glib |
||||
]; |
||||
|
||||
patches = [ |
||||
./fix-java-home-jdk10.patch |
||||
./read-truststore-from-env-jdk10.patch |
||||
./currency-date-range-jdk10.patch |
||||
./increase-javadoc-heap.patch |
||||
# -Wformat etc. are stricter in newer gccs, per |
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 |
||||
# so grab the work-around from |
||||
# https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 |
||||
(fetchurl { |
||||
url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch; |
||||
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; |
||||
}) |
||||
] ++ lib.optionals (!headless && enableGnome2) [ |
||||
./swing-use-gtk-jdk10.patch |
||||
]; |
||||
|
||||
prePatch = '' |
||||
chmod +x configure |
||||
patchShebangs --build configure |
||||
''; |
||||
|
||||
configureFlags = [ |
||||
"--with-boot-jdk=${openjdk11.home}" |
||||
"--enable-unlimited-crypto" |
||||
"--with-native-debug-symbols=internal" |
||||
"--with-libjpeg=system" |
||||
"--with-giflib=system" |
||||
"--with-libpng=system" |
||||
"--with-zlib=system" |
||||
"--with-lcms=system" |
||||
"--with-stdc++lib=dynamic" |
||||
] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" |
||||
++ lib.optional headless "--enable-headless-only" |
||||
++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; |
||||
|
||||
separateDebugInfo = true; |
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; |
||||
|
||||
NIX_LDFLAGS = lib.optionals (!headless) [ |
||||
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" |
||||
] ++ lib.optionals (!headless && enableGnome2) [ |
||||
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" |
||||
]; |
||||
|
||||
buildFlags = [ "all" ]; |
||||
|
||||
installPhase = '' |
||||
mkdir -p $out/lib |
||||
|
||||
mv build/*/images/jdk $out/lib/openjdk |
||||
|
||||
# Remove some broken manpages. |
||||
rm -rf $out/lib/openjdk/man/ja* |
||||
|
||||
# Mirror some stuff in top-level. |
||||
mkdir -p $out/share |
||||
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/ |
||||
|
||||
# Remove crap from the installation. |
||||
rm -rf $out/lib/openjdk/demo |
||||
${lib.optionalString headless '' |
||||
rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so |
||||
''} |
||||
|
||||
ln -s $out/lib/openjdk/bin $out/bin |
||||
''; |
||||
|
||||
preFixup = '' |
||||
# Propagate the setJavaClassPath setup hook so that any package |
||||
# that depends on the JDK has $CLASSPATH set up properly. |
||||
mkdir -p $out/nix-support |
||||
#TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 |
||||
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-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 |
||||
if [ "$output" = debug ]; then continue; fi |
||||
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 |
||||
if [ "$output" = debug ]; then continue; fi |
||||
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 |
||||
''; |
||||
|
||||
disallowedReferences = [ openjdk11 ]; |
||||
|
||||
meta = with stdenv.lib; { |
||||
homepage = http://openjdk.java.net/; |
||||
license = licenses.gpl2; |
||||
description = "The open-source Java Development Kit"; |
||||
maintainers = with maintainers; [ edwtjo ]; |
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; |
||||
}; |
||||
|
||||
passthru = { |
||||
architecture = ""; |
||||
home = "${openjdk}/lib/openjdk"; |
||||
}; |
||||
}; |
||||
in openjdk |
||||
@ -0,0 +1,12 @@ |
||||
diff -uw -r a/make/Docs.gmk b/make/Docs.gmk
|
||||
--- a/make/Docs.gmk 2019-10-09 08:05:43.107349180 -0400
|
||||
+++ b/make/Docs.gmk 2019-10-09 08:09:29.330118790 -0400
|
||||
@@ -277,7 +277,7 @@
|
||||
$1_ALL_MODULES := $$(sort $$($1_MODULES) $$($1_INDIRECT_EXPORTS))
|
||||
|
||||
$1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) \
|
||||
- -Djspec.version=$$(VERSION_SPECIFICATION)
|
||||
+ -Djspec.version=$$(VERSION_SPECIFICATION) -Xmx1G
|
||||
|
||||
ifeq ($$(ENABLE_FULL_DOCS), true)
|
||||
# Tell the ModuleGraph taglet to generate html links to soon-to-be-created
|
||||
@ -0,0 +1,17 @@ |
||||
--- a/modules/javafx.graphics/src/main/legal/mesa3d.md 1969-12-31 19:00:01.000000000 -0500
|
||||
+++ b/modules/javafx.graphics/src/main/legal/mesa3d.md 2019-08-08 01:05:04.000000000 -0400
|
||||
@@ -1,7 +1,7 @@
|
||||
## Mesa 3-D Graphics Library v5.0
|
||||
|
||||
### Mesa License
|
||||
-```
|
||||
+<pre>
|
||||
|
||||
Mesa 3-D graphics library
|
||||
Version: 5.0
|
||||
@@ -25,4 +25,4 @@
|
||||
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
-```
|
||||
+</pre>
|
||||
@ -0,0 +1,22 @@ |
||||
--- a/src/java.desktop/share/classes/javax/swing/UIManager.java 2019-08-08 01:05:04.000000000 -0400
|
||||
+++ b/src/java.desktop/share/classes/javax/swing/UIManager.java 2019-10-09 08:20:31.791606748 -0400
|
||||
@@ -660,9 +660,8 @@
|
||||
Toolkit toolkit = Toolkit.getDefaultToolkit();
|
||||
if (toolkit instanceof SunToolkit) {
|
||||
SunToolkit suntk = (SunToolkit)toolkit;
|
||||
- String desktop = suntk.getDesktop();
|
||||
boolean gtkAvailable = suntk.isNativeGTKAvailable();
|
||||
- if ("gnome".equals(desktop) && gtkAvailable) {
|
||||
+ if (gtkAvailable) {
|
||||
return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
|
||||
}
|
||||
}
|
||||
@@ -1397,7 +1396,7 @@
|
||||
lafName = lafData.remove("defaultlaf");
|
||||
}
|
||||
if (lafName == null) {
|
||||
- lafName = getCrossPlatformLookAndFeelClassName();
|
||||
+ lafName = getSystemLookAndFeelClassName();
|
||||
}
|
||||
lafName = swingProps.getProperty(defaultLAFKey, lafName);
|
||||
|
||||
Loading…
Reference in new issue