From 745401b28a852b2c9e34dfc0112d6b97e688267d Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:16:13 -0700
Subject: [PATCH] dxx-rebirth: move to by-name/

---
 pkgs/{games => by-name/dx}/dxx-rebirth/assets.nix         | 0
 pkgs/{games => by-name/dx}/dxx-rebirth/full.nix           | 0
 .../default.nix => by-name/dx/dxx-rebirth/package.nix}    | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/{games => by-name/dx}/dxx-rebirth/assets.nix (100%)
 rename pkgs/{games => by-name/dx}/dxx-rebirth/full.nix (100%)
 rename pkgs/{games/dxx-rebirth/default.nix => by-name/dx/dxx-rebirth/package.nix} (90%)

diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/by-name/dx/dxx-rebirth/assets.nix
similarity index 100%
rename from pkgs/games/dxx-rebirth/assets.nix
rename to pkgs/by-name/dx/dxx-rebirth/assets.nix
diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/by-name/dx/dxx-rebirth/full.nix
similarity index 100%
rename from pkgs/games/dxx-rebirth/full.nix
rename to pkgs/by-name/dx/dxx-rebirth/full.nix
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/by-name/dx/dxx-rebirth/package.nix
similarity index 90%
rename from pkgs/games/dxx-rebirth/default.nix
rename to pkgs/by-name/dx/dxx-rebirth/package.nix
index a0186148e404..8d52835a5457 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/by-name/dx/dxx-rebirth/package.nix
@@ -64,11 +64,11 @@ stdenv.mkDerivation {
 
   passthru.updateScript = unstableGitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Source Port of the Descent 1 and 2 engines";
     homepage = "https://www.dxx-rebirth.com/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = with platforms; linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e2ff27b154b..e5ba669cde58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13127,14 +13127,13 @@ with pkgs;
 
   dfhack = dwarf-fortress-packages.dwarf-fortress-full;
 
-  dxx-rebirth = callPackage ../games/dxx-rebirth { };
 
-  inherit (callPackages ../games/dxx-rebirth/assets.nix { })
+  inherit (callPackages ../by-name/dx/dxx-rebirth/assets.nix { })
     descent1-assets
     descent2-assets
     ;
 
-  inherit (callPackages ../games/dxx-rebirth/full.nix { })
+  inherit (callPackages ../by-name/dx/dxx-rebirth/full.nix { })
     d1x-rebirth-full
     d2x-rebirth-full
     ;