From 529ce40be96eddce5df27e281d60c76751112a6e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 14 May 2025 13:50:37 +0300
Subject: [PATCH] gamescope: 3.16.4 -> 3.16.7

Switch to pre-release versions of stb and glm downloaded as wraps.
This is not great, but it's probably better than leaving weird bugs.
---
 pkgs/by-name/ga/gamescope/package.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 23b59aeb52b8..87d2b5bed8d8 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -3,6 +3,7 @@
   buildPackages,
   edid-decode,
   fetchFromGitHub,
+  fetchpatch,
   meson,
   pkg-config,
   ninja,
@@ -48,14 +49,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gamescope";
-  version = "3.16.4";
+  version = "3.16.7";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "gamescope";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-2AxqvZA1eZaJFKMfRljCIcP0M2nMngw0FQiXsfBW7IA=";
+    hash = "sha256-q0yTOyu47tQXorFfnmRa4wrt0KRnyelLDmfcg4iwPfs=";
   };
 
   patches = [
@@ -63,6 +64,19 @@ stdenv.mkDerivation (finalAttrs: {
     ./shaders-path.patch
     # patch relative gamescopereaper path with absolute
     ./gamescopereaper.patch
+
+    # Revert change to always use vendored stb/glm libraries
+    # Upstream discussion: https://github.com/ValveSoftware/gamescope/pull/1751
+    (fetchpatch {
+      url = "https://github.com/ValveSoftware/gamescope/commit/baae74c4b13676fa76a8b200f21ac78f55079734.patch";
+      revert = true;
+      hash = "sha256-XpbyLQ4R9KgBR3hlrgPzmM7Zxr2jm4Q10zGjyhh/Qxw=";
+    })
+    (fetchpatch {
+      url = "https://github.com/ValveSoftware/gamescope/commit/72bae179ba2ebbbc91ed07c7f66e7e4964a4cd9e.patch";
+      revert = true;
+      hash = "sha256-aglfGvEuycNyPlaFYxqqvPAgFpWns3xZ3B2GiAefxtg=";
+    })
   ];
 
   # We can't substitute the patch itself because substituteAll is itself a derivation,