From 08daba9d2f1321783b0a2f6699ed8e7ffa35bde9 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 16 Dec 2024 22:34:56 +0100
Subject: [PATCH 1/5] gamescope: 3.15.15 -> 3.16.1

---
 pkgs/by-name/ga/gamescope/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index f03a165109d0..7c341c948208 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -32,6 +32,7 @@
   libdecor,
   lcms,
   lib,
+  luajit,
   makeBinaryWrapper,
   nix-update-script,
   enableExecutable ? true,
@@ -47,14 +48,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gamescope";
-  version = "3.15.15";
+  version = "3.16.1";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "gamescope";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-FiPSGzfA3YH9TED8E5hpfpd+IQGthvwsxAFXZuqVZ4Q=";
+    hash = "sha256-+0QGt4UADJmZok2LzvL+GBad0t4vVL4HXq27399zH3Y=";
   };
 
   patches = [
@@ -72,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs subprojects/libdisplay-info/tool/gen-search-table.py
     # Replace gamescopereeaper with absolute path
     substituteInPlace src/Utils/Process.cpp --subst-var-by "gamescopereaper" "$out/bin/gamescopereaper"
+    patchShebangs default_scripts_install.sh
   '';
 
   mesonFlags = [
@@ -118,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
       wayland-protocols
       vulkan-loader
       glm
+      luajit
     ]
     ++ lib.optionals enableWsi [
       vulkan-headers

From 7f846d5934ad5f36ed96bfab3e9d983f72c00f90 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 16 Dec 2024 22:35:55 +0100
Subject: [PATCH 2/5] gamescope: use `--replace-fail`

---
 pkgs/by-name/ga/gamescope/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 7c341c948208..19aa9af95aed 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -68,7 +68,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 "@out@" "$out"
+    substituteInPlace src/reshade_effect_manager.cpp --replace-fail "@out@" "$out"
     # Patching shebangs in the main `libdisplay-info` build
     patchShebangs subprojects/libdisplay-info/tool/gen-search-table.py
     # Replace gamescopereeaper with absolute path

From e3e029982374ee01ec9661b620f3d4bc65165229 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 16 Dec 2024 22:36:43 +0100
Subject: [PATCH 3/5] gamescope: avoid `with lib`

---
 pkgs/by-name/ga/gamescope/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 19aa9af95aed..998711b40e54 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -176,18 +176,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "SteamOS session compositing window manager";
     homepage = "https://github.com/ValveSoftware/gamescope";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [
       nrdxp
       pedrohlc
       Scrumplex
       zhaofengli
       k900
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "gamescope";
   };
 })

From fbfc522cb84cce548ad4bdf06171db44d8090451 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 16 Dec 2024 22:38:04 +0100
Subject: [PATCH 4/5] gamescope: add myself as maintainer

---
 pkgs/by-name/ga/gamescope/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 998711b40e54..6755e603163f 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -186,6 +186,7 @@ stdenv.mkDerivation (finalAttrs: {
       Scrumplex
       zhaofengli
       k900
+      Gliczy
     ];
     platforms = lib.platforms.linux;
     mainProgram = "gamescope";

From df8f977f5b323c644528950e9484ac781e4c7fc6 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 16 Dec 2024 22:43:19 +0100
Subject: [PATCH 5/5] gamescope: update shader source The owner
 (`Joshua-Ashton`) has migrated to `misyltoad`

---
 pkgs/by-name/ga/gamescope/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 6755e603163f..5a37da55a92f 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -39,8 +39,8 @@
   enableWsi ? true,
 }:
 let
-  joshShaders = fetchFromGitHub {
-    owner = "Joshua-Ashton";
+  frogShaders = fetchFromGitHub {
+    owner = "misyltoad";
     repo = "GamescopeShaders";
     rev = "v0.1";
     hash = "sha256-gR1AeAHV/Kn4ntiEDUSPxASLMFusV6hgSGrTbMCBUZA=";
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Install ReShade shaders
     mkdir -p $out/share/gamescope/reshade
-    cp -r ${joshShaders}/* $out/share/gamescope/reshade/
+    cp -r ${frogShaders}/* $out/share/gamescope/reshade/
   '';
 
   passthru.updateScript = nix-update-script { };