From c666c5613a0ec78bb413029ecd63a4593f02536d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rolf=20Schr=C3=B6der?= Date: Sat, 22 Mar 2025 18:53:04 +0100 Subject: [PATCH] corretto: use majorVersion ("featureVersion") in pname --- pkgs/development/compilers/corretto/mk-corretto.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index ae77a19385e9..baca120db3f9 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -18,12 +18,13 @@ # builds. However, Corretto uses `gradle` as build tool (which in turn will # invoke `make`). The configure/build phases are adapted as needed. -let - pname = "corretto"; -in # The version scheme is different between OpenJDK & Corretto. # See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40 # "major.minor.security.build.revision" +let + majorVersion = builtins.head (lib.strings.splitString "." version); # same as "featureVersion" for OpenJDK + pname = "corretto${majorVersion}"; +in jdk.overrideAttrs ( finalAttrs: oldAttrs: { inherit pname version src;