diff --git a/pkgs/games/openxray/default.nix b/pkgs/by-name/op/openxray/package.nix
similarity index 93%
rename from pkgs/games/openxray/default.nix
rename to pkgs/by-name/op/openxray/package.nix
index 51579c472311..2881f39126ca 100644
--- a/pkgs/games/openxray/default.nix
+++ b/pkgs/by-name/op/openxray/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  gccStdenv,
   fetchFromGitHub,
   gitUpdater,
   cmake,
@@ -15,7 +15,11 @@
   pcre,
   makeWrapper,
 }:
-
+let
+  # Builds with Clang, but hits an assertion failure unless GCC is used
+  # https://github.com/OpenXRay/xray-16/issues/1224
+  stdenv = gccStdenv;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openxray";
   version = "2921-january-2025-rc1";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93df76c8b22c..a9db1b475a7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12345,12 +12345,6 @@ with pkgs;
 
   openra = openraPackages.engines.release;
 
-  openxray = callPackage ../games/openxray {
-    # Builds with Clang, but hits an assertion failure unless GCC is used
-    # https://github.com/OpenXRay/xray-16/issues/1224
-    stdenv = gccStdenv;
-  };
-
   papermcServers = callPackages ../games/papermc { };
 
   papermc = papermcServers.papermc;