From 22a4a55dff3b03c1e1a737849fadf80d1b6e8eb9 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 25 Feb 2026 11:04:02 +0800 Subject: [PATCH] hmcl: only use glfw3-minecraft for linux --- pkgs/by-name/hm/hmcl/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index d33be8fb110b..7936ab5ea391 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -32,6 +32,7 @@ xrandr, glib, libGL, + glfw3, glfw3-minecraft, openal, libglvnd, @@ -43,6 +44,9 @@ callPackage, gtk3, }: +let + glfw3' = if stdenv.hostPlatform.isLinux then glfw3-minecraft else glfw3; +in stdenv.mkDerivation (finalAttrs: { pname = "hmcl"; version = "3.11.1"; @@ -137,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { runtimeDeps = [ libGL - glfw3-minecraft + glfw3' glib openal libglvnd @@ -188,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: { lib.makeBinPath (minecraftJdks ++ lib.optional stdenv.hostPlatform.isLinux xrandr) }" \ --run 'cd $HOME' \ - --prefix JAVA_TOOL_OPTIONS " " "-Dorg.lwjgl.glfw.libname=${lib.getLib glfw3-minecraft}/lib/libglfw.so" \ + ${lib.optionalString stdenv.hostPlatform.isLinux ''--prefix JAVA_TOOL_OPTIONS " " "-Dorg.lwjgl.glfw.libname=${lib.getLib glfw3'}/lib/libglfw.so"''} \ ''${gappsWrapperArgs[@]} '';