Merge pull request #232199 from Sohalt/jdk20 (370b624c) · Commits · nix / nixpkgs

pkgs/development/compilers/openjdk/20.nix

0 → 100644

+195 −0

Original line number	Diff line number	Diff line
		{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio
		, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
		, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
		, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk20-bootstrap
		, ensureNewerSourcesForZipFilesHook
		, setJavaClassPath
		# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
		# which should be fixable, this is a no-rebuild workaround for GHC.
		, headless ? stdenv.targetPlatform.isGhcjs
		, enableJavaFX ? false, openjfx
		, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
		}:

		let
		version = {
		feature = "20";
		interim = "";
		build = "36";
		};

		# when building a headless jdk, also bootstrap it with a headless jdk
		openjdk-bootstrap = openjdk20-bootstrap.override { gtkSupport = !headless; };

		openjdk = stdenv.mkDerivation {
		pname = "openjdk" + lib.optionalString headless "-headless";
		version = "${version.feature}${version.interim}+${version.build}";

		src = fetchFromGitHub {
		owner = "openjdk";
		repo = "jdk${version.feature}u";
		rev = "jdk-${version.feature}${version.interim}+${version.build}";
		hash = "sha256-fXoSO8nq5qpUYbCtbrRr2C46XRdYX77Pxmk7GfmlZV4=";
		};

		nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];
		buildInputs = [
		cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
		libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
		libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
		] ++ 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-jdk13.patch
		./ignore-LegalNoticeFilePlugin-jdk18.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";
		})

		# Patch borrowed from Alpine to fix build errors with musl libc and recent gcc.
		# This is applied anywhere to prevent patchrot.
		(fetchpatch {
		url = "https://git.alpinelinux.org/aports/plain/testing/openjdk19/FixNullPtrCast.patch?id=93dc07f97ff716b647c5f57c6224901ea06da560";
		hash = "sha256-H4X3Yip5bCpXMH7MSu9BgXIOYRVUBMZPZW8EvZSWI5k=";
		})

		# Fix build for gnumake-4.4.1:
		# https://github.com/openjdk/jdk/pull/12992
		(fetchpatch {
		name = "gnumake-4.4.1";
		url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
		hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
		})
		] ++ lib.optionals (!headless && enableGnome2) [
		./swing-use-gtk-jdk13.patch
		];

		postPatch = ''
		chmod +x configure
		patchShebangs --build configure
		'';

		# JDK's build system attempts to specifically detect
		# and special-case WSL, and we don't want it to do that,
		# so pass the correct platform names explicitly
		configurePlatforms = ["build" "host"];

		configureFlags = [
		"--with-boot-jdk=${openjdk-bootstrap.home}"
		"--with-version-build=${version.build}"
		"--with-version-opt=nixos"
		"--with-version-pre="
		"--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;

		env.NIX_CFLAGS_COMPILE = "-Wno-error";

		NIX_LDFLAGS = toString (lib.optionals (!headless) [
		"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
		] ++ lib.optionals (!headless && enableGnome2) [
		"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
		]);

		# -j flag is explicitly rejected by the build system:
		# Error: 'make -jN' is not supported, use 'make JOBS=N'
		# Note: it does not make build sequential. Build system
		# still runs in parallel.
		enableParallelBuilding = false;

		buildFlags = [ "images" ];

		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

		# IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
		ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip

		# 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 $(getAllOutputNames); do
		if [ "$output" = debug ]; then continue; fi
		LIBDIRS="$(find $(eval echo \$$output) -name \.so\ -exec dirname {} \+ \| sort -u \| tr '\n' ':'):$LIBDIRS"
		done
		# Add the local library paths to remove dependencies on the bootstrap
		for output in $(getAllOutputNames); 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 = [ openjdk-bootstrap ];

		pos = builtins.unsafeGetAttrPos "feature" version;
		meta = import ./meta.nix lib version.feature;

		passthru = {
		architecture = "";
		home = "${openjdk}/lib/openjdk";
		inherit gtk3;
		};
		};
		in openjdk

pkgs/development/compilers/openjdk/darwin/20.nix

0 → 100644

+81 −0

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
		let
		# Details from https://www.azul.com/downloads/?version=java-19-sts&os=macos&package=jdk
		# Note that the latest build may differ by platform
		dist = {
		x86_64-darwin = {
		arch = "x64";
		zuluVersion = "20.30.11";
		jdkVersion = "20.0.1";
		sha256 = "0hg2n2mdbpxsgpw3c58w8y1f3im6schvfqahji352p9ljbdykzmy";
		};

		aarch64-darwin = {
		arch = "aarch64";
		zuluVersion = "20.30.11";
		jdkVersion = "20.0.1";
		sha256 = "0bc9h1y0b2azyfl3f5sqj19sh02xs995d1kdn55m4lfhc00rzr81";
		};
		}."${stdenv.hostPlatform.system}";

		jce-policies = fetchurl {
		# Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
		url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
		sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
		};

		jdk = stdenv.mkDerivation rec {
		pname = "zulu${dist.zuluVersion}-ca-jdk";
		version = dist.jdkVersion;

		src = fetchurl {
		url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
		inherit (dist) sha256;
		curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
		};

		nativeBuildInputs = [ unzip ];

		installPhase = ''
		mkdir -p $out
		mv * $out

		unzip ${jce-policies}
		mv -f ZuluJCEPolicies/*.jar $out/lib/security/

		# jni.h expects jni_md.h to be in the header search path.
		ln -s $out/include/darwin/*_md.h $out/include/

		if [ -f $out/LICENSE ]; then
		install -D $out/LICENSE $out/share/zulu/LICENSE
		rm $out/LICENSE
		fi
		'';

		preFixup = ''
		# Propagate the setJavaClassPath setup hook from the JDK so that
		# any package that depends on the JDK has $CLASSPATH set up
		# properly.
		mkdir -p $out/nix-support
		printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs

		# Set JAVA_HOME automatically.
		cat <<EOF >> $out/nix-support/setup-hook
		if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
		EOF
		'';

		# fixupPhase is moving the man to share/man which breaks it because it's a
		# relative symlink.
		postFixup = ''
		ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man
		'';

		passthru = {
		home = jdk;
		};

		meta = import ./meta.nix lib version;
		};
		in
		jdk

pkgs/development/compilers/openjdk/openjfx/20.nix

0 → 100644

+113 −0

Original line number	Diff line number	Diff line
		{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless
		, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
		, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68
		, withMedia ? true
		, withWebKit ? false
		}:

		let
		major = "20";
		update = "";
		build = "+19";
		repover = "${major}${update}${build}";
		gradle_ = (gradle_7.override {
		# note: gradle does not yet support running on 19
		java = openjdk17_headless;
		});

		makePackage = args: stdenv.mkDerivation ({
		version = "${major}${update}${build}";

		src = fetchFromGitHub {
		owner = "openjdk";
		repo = "jfx";
		rev = repover;
		hash = "sha256-QPPJyl6+XU+m5xqYOFtQKJNNrovqy7ngNE/e7kiEJVU=";
		};

		buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ];
		nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];

		dontUseCmakeConfigure = true;

		config = writeText "gradle.properties" (''
		CONF = Release
		JDK_HOME = ${openjdk19_headless.home}
		'' + args.gradleProperties or "");

		buildPhase = ''
		runHook preBuild

		export GRADLE_USER_HOME=$(mktemp -d)
		ln -s $config gradle.properties
		export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
		gradle --no-daemon $gradleFlags sdk

		runHook postBuild
		'';
		} // args);

		# Fake build to pre-download deps into fixed-output derivation.
		# We run nearly full build because I see no other way to download everything that's needed.
		# Anyone who knows a better way?
		deps = makePackage {
		pname = "openjfx-deps";

		# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
		installPhase = ''
		find $GRADLE_USER_HOME -type f -regex './modules.\.$jar\\|pom$' \
		\| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr\|\.\|/\|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
		\| sh
		rm -rf $out/tmp
		'';

		outputHashAlgo = "sha256";
		outputHashMode = "recursive";
		# suspiciously the same as for openjfx 17 ...
		# could they really not have changed any of their dependencies?
		# or did we miss changing another upstream hash when copy-pasting?
		outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo=";
		};

		in makePackage {
		pname = "openjfx-modular-sdk";

		gradleProperties = ''
		COMPILE_MEDIA = ${lib.boolToString withMedia}
		COMPILE_WEBKIT = ${lib.boolToString withWebKit}
		'';

		preBuild = ''
		swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)"
		substituteInPlace build.gradle \
		--replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \
		--replace 'name: SWT_FILE_NAME' "files('$swtJar')"
		'';

		installPhase = ''
		cp -r build/modular-sdk $out
		'';

		stripDebugList = [ "." ];

		postFixup = ''
		# Remove references to bootstrap.
		export openjdkOutPath='${openjdk19_headless.outPath}'
		find "$out" -name \*.so \| while read lib; do
		new_refs="$(patchelf --print-rpath "$lib" \| perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
		patchelf --set-rpath "$new_refs" "$lib"
		done
		'';

		disallowedReferences = [ openjdk17_headless openjdk19_headless ];

		passthru.deps = deps;

		meta = with lib; {
		homepage = "https://openjdk.org/projects/openjfx/";
		license = licenses.gpl2Classpath;
		description = "The next-generation Java client toolkit";
		maintainers = with maintainers; [ abbradar ];
		platforms = platforms.unix;
		};
		}

pkgs/development/compilers/temurin-bin/generate-sources.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ import re
		import requests
		import sys

		feature_versions = (8, 11, 16, 17, 18, 19)
		feature_versions = (8, 11, 16, 17, 18, 19, 20)
		oses = ("mac", "linux", "alpine-linux")
		types = ("jre", "jdk")
		impls = ("hotspot")

pkgs/development/compilers/temurin-bin/jdk-darwin.nix

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,4 +19,7 @@ in

		jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; };
		jre-19 = common { sourcePerArch = sources.jre.openjdk19; };

		jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; };
		jre-20 = common { sourcePerArch = sources.jre.openjdk20; };
		}