Merge pull request #306922 from rollf/corretto21 (28668355) · Commits · nix / nixpkgs

pkgs/development/compilers/corretto/11.nix

+7 −12

Original line number	Diff line number	Diff line
		@@ -14,6 +14,12 @@ let
		inherit lib stdenv rsync runCommand testers;
		jdk = jdk11;
		gradle = gradle_7;
		extraConfig = [
		# jdk11 is built with --disable-warnings-as-errors (see openjdk/11.nix)
		# because of several compile errors. We need to include this parameter for
		# Corretto, too.
		"--disable-warnings-as-errors"
		];
		version = "11.0.20.9.1";
		src = fetchFromGitHub {
		owner = "corretto";
		@@ -23,15 +29,4 @@ let
		};
		};
		in
		corretto.overrideAttrs (oldAttrs: {
		# jdk11 is built with --disable-warnings-as-errors (see openjdk/11.nix)
		# because of several compile errors. We need to include this parameter for
		# Corretto, too. Since the build is invoked via `gradle` build.gradle has to
		# be adapted.
		postPatch = oldAttrs.postPatch + ''
		for file in $(find installers -name "build.gradle"); do
		substituteInPlace $file --replace "command += archSpecificFlags" "command += archSpecificFlags + ['--disable-warnings-as-errors']"
		done
		'';

		})
		corretto

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		{ corretto21
		, fetchFromGitHub
		, gradle_7
		, jdk21
		, lib
		, stdenv
		, rsync
		, runCommand
		, testers
		}:

		let
		corretto = import ./mk-corretto.nix {
		inherit lib stdenv rsync runCommand testers;
		jdk = jdk21;
		gradle = gradle_7;
		version = "21.0.3.9.1";
		src = fetchFromGitHub {
		owner = "corretto";
		repo = "corretto-21";
		rev = "97b366227b4dc8f5a89bbedea88b0b18c9e21886";
		sha256 = "sha256-V8UDyukDCQVTWUg4IpSKoY0qnnQ5fePbm3rxcw06Vr0=";
		};
		};
		in
		corretto

+4 −2

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		, lib
		, stdenv
		, gradle
		, extraConfig ? [ ]
		, rsync
		, runCommand
		, testers
		@@ -38,7 +39,7 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: {

		# `/usr/bin/rsync` is invoked to copy the source tree. We don't have that.
		for file in $(find installers -name "build.gradle"); do
		substituteInPlace $file --replace "workingDir '/usr/bin'" "workingDir '.'"
		substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'"
		done
		'';

		@@ -51,12 +52,13 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: {
		if stdenv.isDarwin then
		":installers:mac:tar:packageBuildResults"
		else ":installers:linux:universal:tar:packageBuildResults";
		extra_config = builtins.concatStringsSep " " extraConfig;
		in
		''
		runHook preBuild

		# Corretto's actual built is triggered via `gradle`.
		gradle --console=plain --no-daemon ${task}
		gradle -Pcorretto.extra_config="${extra_config}" --console=plain --no-daemon ${task}

		# Prepare for the installPhase so that it looks like if a normal
		# OpenJDK had been built.

+1 −0

Original line number	Diff line number	Diff line
		@@ -15470,6 +15470,7 @@ with pkgs;
		corretto11 = javaPackages.compiler.corretto11;
		corretto17 = javaPackages.compiler.corretto17;
		corretto19 = javaPackages.compiler.corretto19;
		corretto21 = javaPackages.compiler.corretto21;

		cotton = callPackage ../development/tools/cotton {
		inherit (darwin.apple_sdk.frameworks) CoreServices;

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ in {
		corretto11 = callPackage ../development/compilers/corretto/11.nix { };
		corretto17 = callPackage ../development/compilers/corretto/17.nix { };
		corretto19 = callPackage ../development/compilers/corretto/19.nix { };
		corretto21 = callPackage ../development/compilers/corretto/21.nix { };

		openjdk8-bootstrap = mkBootstrap adoptopenjdk-8
		../development/compilers/openjdk/bootstrap.nix