gamescope: 3.16.23 -> 3.16.24 (#524987)

pkgs/by-name/ga/gamescope/package.nix

@@ -47,6 +47,7 @@
   lcms,
   lib,
   luajit,
+  catch2_3,
   makeBinaryWrapper,
   nix-update-script,
   enableExecutable ? true,
@@ -62,14 +63,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gamescope";
-  version = "3.16.23";
+  version = "3.16.24";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "gamescope";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-q9AZTe6fBgJBt5/c3x8PVrnDF+MtRmQ1OWZq9ZsSe/M=";
+    hash = "sha256-+4jEQAUGKOFJkLUJHIz1hVx7kbt+wMhLcbboiz0PC/E=";
   };
 
   patches = [
@@ -85,14 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-O358ScIIndfkc1S0A8g2jKvFWoCzcXB/g6lRJamqOI4=";
     })
 
-    # Backport upstream patch for wlroots fixing build with libinput 1.31
-    (fetchpatch {
-      url = "https://github.com/misyltoad/wlroots/compare/54e844748029d4874e14d0c086d50092c04c8899...c08d99437ec8bb56a703f04ad1ef199502c62d10.diff";
-      stripLen = 1;
-      extraPrefix = "subprojects/wlroots/";
-      hash = "sha256-q2zekWNn111lX8N938y8HjREvlNMtdCLJ4RveX9z8u8=";
-    })
-
     # Pending upstream patch to support stb_image_resize2.h
     # See: https://github.com/ValveSoftware/gamescope/pull/2130
     (fetchpatch {
@@ -104,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
   # We can't substitute the patch itself because substituteAll is itself a derivation,
   # so `placeholder "out"` ends up pointing to the wrong place
   postPatch = ''
-    substituteInPlace src/reshade_effect_manager.cpp --replace-fail "@out@" "$out"
+    substituteInPlace src/Utils/DirHelpers.cpp --replace-fail "@out@" "$out"
 
     # Patching shebangs in the main `libdisplay-info` build
     patchShebangs subprojects/libdisplay-info/tool/gen-search-table.py
@@ -160,10 +153,9 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     wayland
     wayland-protocols
-    vulkan-loader
-  ]
-  ++ lib.optionals enableWsi [
     vulkan-headers
+    vulkan-loader
+    catch2_3
   ]
   ++ lib.optionals enableExecutable (
     wlroots_0_19.buildInputs

pkgs/by-name/ga/gamescope/shaders-path.patch

@@ -1,13 +1,13 @@
-diff --git a/src/reshade_effect_manager.cpp b/src/reshade_effect_manager.cpp
-index 3597ca1..de45250 100644
---- a/src/reshade_effect_manager.cpp
-+++ b/src/reshade_effect_manager.cpp
-@@ -34,7 +34,7 @@ static std::string GetLocalUsrDir()
-
- static std::string GetUsrDir()
- {
--    return "/usr";
-+    return "@out@";
- }
-
- static LogScope reshade_log("gamescope_reshade");
+diff --git a/src/Utils/DirHelpers.cpp b/src/Utils/DirHelpers.cpp
+index df0cf34..2b82176 100644
+--- a/src/Utils/DirHelpers.cpp
++++ b/src/Utils/DirHelpers.cpp
+@@ -25,7 +25,7 @@ namespace gamescope {
+ 
+     std::string GetUsrDir()
+     {
+-        return "/usr";
++        return "@out@";
+     }
+ 
+     std::string_view GetConfigDir()