diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/by-name/ga/gamemode/package.nix
similarity index 97%
rename from pkgs/tools/games/gamemode/default.nix
rename to pkgs/by-name/ga/gamemode/package.nix
index 45122bf701b0..ed512d32f76a 100644
--- a/pkgs/tools/games/gamemode/default.nix
+++ b/pkgs/by-name/ga/gamemode/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libgamemode32,
+  pkgsi686Linux,
   makeWrapper,
   meson,
   ninja,
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
           ]
           ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
             # Support wrapping 32bit applications on a 64bit linux system
-            libgamemode32
+            pkgsi686Linux.gamemode.lib
           ]
         )
       }
diff --git a/pkgs/tools/games/gamemode/preload-nix-workaround.patch b/pkgs/by-name/ga/gamemode/preload-nix-workaround.patch
similarity index 100%
rename from pkgs/tools/games/gamemode/preload-nix-workaround.patch
rename to pkgs/by-name/ga/gamemode/preload-nix-workaround.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd37e2aebe15..ca13df5fe111 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -991,10 +991,6 @@ with pkgs;
 
   dehinter = with python3Packages; toPythonApplication dehinter;
 
-  gamemode = callPackage ../tools/games/gamemode {
-    libgamemode32 = pkgsi686Linux.gamemode.lib;
-  };
-
   gamescope-wsi = callPackage ../by-name/ga/gamescope/package.nix {
     enableExecutable = false;
     enableWsi = true;