From c4028683adfe6384b4ed7c8b4dcf36ec8dbdbf6c Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 9 Oct 2025 08:08:00 -0300
Subject: [PATCH] xpilot-ng: move to by-name, modernize

---
 .../xp/xpilot-ng/package.nix}                    | 16 ++++++++--------
 .../xp/xpilot-ng}/xpilot-ng-gcc-14-fix.patch     |  0
 .../xp/xpilot-ng}/xpilot-ng-sdl-window-fix.patch |  0
 pkgs/top-level/all-packages.nix                  |  1 -
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename pkgs/{games/xpilot/default.nix => by-name/xp/xpilot-ng/package.nix} (60%)
 rename pkgs/{games/xpilot => by-name/xp/xpilot-ng}/xpilot-ng-gcc-14-fix.patch (100%)
 rename pkgs/{games/xpilot => by-name/xp/xpilot-ng}/xpilot-ng-sdl-window-fix.patch (100%)

diff --git a/pkgs/games/xpilot/default.nix b/pkgs/by-name/xp/xpilot-ng/package.nix
similarity index 60%
rename from pkgs/games/xpilot/default.nix
rename to pkgs/by-name/xp/xpilot-ng/package.nix
index 11ccbc8d5a74..b5e54059c896 100644
--- a/pkgs/games/xpilot/default.nix
+++ b/pkgs/by-name/xp/xpilot-ng/package.nix
@@ -14,12 +14,12 @@
   zlib,
   libXxf86misc,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xpilot-ng";
   version = "4.7.3";
   src = fetchurl {
-    url = "mirror://sourceforge/xpilot/xpilot_ng/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "02a7pnp88kh88fzda5q8mzlckk6y9r5fw47j00h26wbsfly0k1zj";
+    url = "mirror://sourceforge/xpilot/xpilot_ng/xpilot-ng-${finalAttrs.version}/xpilot-ng-${finalAttrs.version}.tar.gz";
+    hash = "sha256-8ocJPHV6cSMgAPIQ7kpO3szJ6K8IF9W+QwhOhK69Rwk=";
   };
   buildInputs = [
     libX11
@@ -40,11 +40,11 @@ stdenv.mkDerivation rec {
     ./xpilot-ng-sdl-window-fix.patch
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Multiplayer X11 space combat game";
     homepage = "http://xpilot.sf.net/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.raskin ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch b/pkgs/by-name/xp/xpilot-ng/xpilot-ng-gcc-14-fix.patch
similarity index 100%
rename from pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch
rename to pkgs/by-name/xp/xpilot-ng/xpilot-ng-gcc-14-fix.patch
diff --git a/pkgs/games/xpilot/xpilot-ng-sdl-window-fix.patch b/pkgs/by-name/xp/xpilot-ng/xpilot-ng-sdl-window-fix.patch
similarity index 100%
rename from pkgs/games/xpilot/xpilot-ng-sdl-window-fix.patch
rename to pkgs/by-name/xp/xpilot-ng/xpilot-ng-sdl-window-fix.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a1c7a5c4ce0..d62dc543d9eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13737,7 +13737,6 @@ with pkgs;
   xonotic-glx-unwrapped = xonotic-glx.xonotic-unwrapped;
   xonotic-dedicated-unwrapped = xonotic-dedicated.xonotic-unwrapped;
 
-  xpilot-ng = callPackage ../games/xpilot { };
   bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix { };
   bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix { };