glfw-wayland-minecraft: drop

pkgs/games/prismlauncher/wrapper.nix

@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , symlinkJoin
-, makeWrapper
 , wrapQtAppsHook
 , addOpenGLRunpath
 
@@ -14,7 +13,6 @@
 , libpulseaudio
 , libGL
 , glfw
-, glfw-wayland-minecraft
 , openal
 , jdk8
 , jdk17
@@ -32,22 +30,15 @@
 , textToSpeechSupport ? stdenv.isLinux
 , controllerSupport ? stdenv.isLinux
 
-  # Adds `glfw-wayland-minecraft` to `LD_LIBRARY_PATH`
-  # when launched on wayland, allowing for the game to be run natively.
-  # Make sure to enable "Use system installation of GLFW" in instance settings
-  # for this to take effect
-  #
-  # Warning: This build of glfw may be unstable, and the launcher
-  # itself can take slightly longer to start
 , withWaylandGLFW ? false
 
 , jdks ? [ jdk21 jdk17 jdk8 ]
 , additionalLibs ? [ ]
 , additionalPrograms ? [ ]
 }:
 
-assert lib.assertMsg (withWaylandGLFW -> stdenv.isLinux) "withWaylandGLFW is only available on Linux";
-
+# glfw 3.4 works without any further patches. TODO: remove this option for 24.10
+assert lib.assertMsg (!withWaylandGLFW) "withWaylandGLFW is no longer needed. This option is going to be removed";
 let
   prismlauncher' = prismlauncher-unwrapped.override {
     inherit msaClientID gamemodeSupport;
@@ -61,31 +52,14 @@ symlinkJoin {
 
   nativeBuildInputs = [
     wrapQtAppsHook
-  ]
-  # purposefully using a shell wrapper here for variable expansion
-  # see https://github.com/NixOS/nixpkgs/issues/172583
-  ++ lib.optional withWaylandGLFW makeWrapper;
+  ];
 
   buildInputs = [
     qtbase
     qtsvg
   ]
   ++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland;
 
-  waylandPreExec = ''
-    if [ -n "$WAYLAND_DISPLAY" ]; then
-      export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH"
-    fi
-  '';
-
-  postBuild = ''
-    ${lib.optionalString withWaylandGLFW ''
-      qtWrapperArgs+=(--run "$waylandPreExec")
-    ''}
-
-    wrapQtAppsHook
-  '';
-
   qtWrapperArgs =
     let
       runtimeLibs = [

pkgs/top-level/aliases.nix

@@ -416,6 +416,7 @@ mapAliases ({
   gitter = throw "gitter has been removed since the client has been abandoned by upstream with the backend migration to Matrix"; # Added 2023-09-18
   glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26
   glfw-wayland = glfw; # Added 2024-04-19
+  glfw-wayland-minecraft = throw "glfw-wayland-minecraft has been removed, as it is no longer needed since glfw 3.4"; # Added 2024-04-25
   gmailieer = lieer; # Added 2020-04-19
   gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02
   gnatboot11 = gnat-bootstrap11;

pkgs/top-level/all-packages.nix

@@ -21101,7 +21101,6 @@ with pkgs;
   };
 
   glfw = glfw3;
-  glfw-wayland-minecraft = callPackage ../development/libraries/glfw/3.x-wayland-minecraft.nix {};
   glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
   glfw3 = callPackage ../development/libraries/glfw/3.x.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL;