From e034c622f807f3d33eb40805bc47aba4abb3b217 Mon Sep 17 00:00:00 2001 From: fym998 <61316972+fym998@users.noreply.github.com> Date: Sat, 14 Jun 2025 23:06:49 +0800 Subject: [PATCH] hmcl: add multiple JDK support --- pkgs/by-name/hm/hmcl/package.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 4a1b9a9b1c0c..867d97f8c374 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -6,7 +6,15 @@ wrapGAppsHook3, copyDesktopItems, imagemagick, - jre, + jdk, + jdk17, + jdk21, + hmclJdk ? jdk, + minecraftJdks ? [ + jdk + jdk17 + jdk21 + ], xorg, glib, libGL, @@ -96,9 +104,10 @@ stdenv.mkDerivation (finalAttrs: { '' runHook preFixup - makeBinaryWrapper ${jre}/bin/java $out/bin/hmcl \ + makeBinaryWrapper ${hmclJdk}/bin/java $out/bin/hmcl \ --add-flags "-jar $out/lib/hmcl/hmcl.jar" \ --set LD_LIBRARY_PATH ${libpath} \ + --prefix PATH : "${lib.makeBinPath minecraftJdks}"\ ''${gappsWrapperArgs[@]} runHook postFixup @@ -111,6 +120,6 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ daru-san ]; - inherit (jre.meta) platforms; + inherit (hmclJdk.meta) platforms; }; })