From aa71ddadfa6158532d5267dda4d6db01237db5bd Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 8 Apr 2024 09:59:47 +0200
Subject: [PATCH 1/2] gamescope: move to by-name

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../default.nix => by-name/ga/gamescope/package.nix}          | 0
 .../ga}/gamescope/shaders-path.patch                          | 0
 .../ga}/gamescope/use-pkgconfig.patch                         | 0
 pkgs/top-level/all-packages.nix                               | 4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{applications/window-managers/gamescope/default.nix => by-name/ga/gamescope/package.nix} (100%)
 rename pkgs/{applications/window-managers => by-name/ga}/gamescope/shaders-path.patch (100%)
 rename pkgs/{applications/window-managers => by-name/ga}/gamescope/use-pkgconfig.patch (100%)

diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/by-name/ga/gamescope/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/gamescope/default.nix
rename to pkgs/by-name/ga/gamescope/package.nix
diff --git a/pkgs/applications/window-managers/gamescope/shaders-path.patch b/pkgs/by-name/ga/gamescope/shaders-path.patch
similarity index 100%
rename from pkgs/applications/window-managers/gamescope/shaders-path.patch
rename to pkgs/by-name/ga/gamescope/shaders-path.patch
diff --git a/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch b/pkgs/by-name/ga/gamescope/use-pkgconfig.patch
similarity index 100%
rename from pkgs/applications/window-managers/gamescope/use-pkgconfig.patch
rename to pkgs/by-name/ga/gamescope/use-pkgconfig.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fbc2701b462..ca00cab93b55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1792,12 +1792,12 @@ with pkgs;
     libgamemode32 = pkgsi686Linux.gamemode.lib;
   };
 
-  gamescope = callPackage ../applications/window-managers/gamescope {
+  gamescope = callPackage ../by-name/ga/gamescope/package.nix {
     enableExecutable = true;
     enableWsi = false;
   };
 
-  gamescope-wsi = callPackage ../applications/window-managers/gamescope {
+  gamescope-wsi = callPackage ../by-name/ga/gamescope/package.nix {
     enableExecutable = false;
     enableWsi = true;
   };

From 57f72cfbc2b9b242d075618351baf5b6296012f7 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 8 Apr 2024 09:59:59 +0200
Subject: [PATCH 2/2] gamescope: pin to wlroots_0_17

This should fix gamescope when using an overlay that replaces wlroots

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/top-level/all-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca00cab93b55..5d38b1071d69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1795,11 +1795,15 @@ with pkgs;
   gamescope = callPackage ../by-name/ga/gamescope/package.nix {
     enableExecutable = true;
     enableWsi = false;
+
+    wlroots = wlroots_0_17;
   };
 
   gamescope-wsi = callPackage ../by-name/ga/gamescope/package.nix {
     enableExecutable = false;
     enableWsi = true;
+
+    wlroots = wlroots_0_17;
   };
 
   gay = callPackage ../tools/misc/gay {  };