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 d27dce0cd59a..e82227fd83fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1792,14 +1792,18 @@ with pkgs;
     libgamemode32 = pkgsi686Linux.gamemode.lib;
   };
 
-  gamescope = callPackage ../applications/window-managers/gamescope {
+  gamescope = callPackage ../by-name/ga/gamescope/package.nix {
     enableExecutable = true;
     enableWsi = false;
+
+    wlroots = wlroots_0_17;
   };
 
-  gamescope-wsi = callPackage ../applications/window-managers/gamescope {
+  gamescope-wsi = callPackage ../by-name/ga/gamescope/package.nix {
     enableExecutable = false;
     enableWsi = true;
+
+    wlroots = wlroots_0_17;
   };
 
   gay = callPackage ../tools/misc/gay {  };