Unverified Commit 692f2c9a authored by Sizhe Zhao's avatar Sizhe Zhao Committed by GitHub
Browse files

hmcl: only use glfw3-minecraft for linux (#493894)

parents 0ca1a30c 22a4a55d

pkgs/by-name/hm/hmcl/package.nix

+6 −2
Original line number Diff line number Diff line
@@ -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[@]}

  '';