From 5703b0c8f8ade1871b0487594a25cb148f8dd91a Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 26 Dec 2025 23:37:51 +0200
Subject: [PATCH 1/2] gamescope: change a default and remove some
 all-packages.nix arguments

Overriding the argument with the same default value as in package.nix
is pointless.

And having the real value be different than what package.nix
implies is confusing.
---
 pkgs/by-name/ga/gamescope/package.nix | 2 +-
 pkgs/top-level/all-packages.nix       | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 682b71e2b338..2453a491ad79 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -37,7 +37,7 @@
   makeBinaryWrapper,
   nix-update-script,
   enableExecutable ? true,
-  enableWsi ? true,
+  enableWsi ? false,
 }:
 let
   frogShaders = fetchFromGitHub {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55dc09810337..7ffbbb9ccf7f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1001,9 +1001,6 @@ with pkgs;
   };
 
   gamescope = callPackage ../by-name/ga/gamescope/package.nix {
-    enableExecutable = true;
-    enableWsi = false;
-
     wlroots = wlroots_0_17;
   };
 

From d2975a9cc0e356f6e76a710ee30f70c400de2b6c Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 27 Dec 2025 00:05:05 +0200
Subject: [PATCH 2/2] gamescope: remove top-level override

---
 pkgs/by-name/ga/gamescope/package.nix | 4 ++--
 pkgs/top-level/all-packages.nix       | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 2453a491ad79..7224f1591a3d 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -29,7 +29,7 @@
   glslang,
   hwdata,
   stb,
-  wlroots,
+  wlroots_0_17,
   libdecor,
   lcms,
   lib,
@@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
   ]
   ++ lib.optionals enableExecutable (
-    wlroots.buildInputs
+    wlroots_0_17.buildInputs
     ++ [
       # gamescope uses a custom wlroots branch
       xorg.libXcomposite
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ffbbb9ccf7f..e343386853f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1000,15 +1000,9 @@ with pkgs;
     libgamemode32 = pkgsi686Linux.gamemode.lib;
   };
 
-  gamescope = callPackage ../by-name/ga/gamescope/package.nix {
-    wlroots = wlroots_0_17;
-  };
-
   gamescope-wsi = callPackage ../by-name/ga/gamescope/package.nix {
     enableExecutable = false;
     enableWsi = true;
-
-    wlroots = wlroots_0_17;
   };
 
   font-v = with python3Packages; toPythonApplication font-v;