From 355e927e8cb7d4128898a2afefde1a0a7e77ae2f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 9 Oct 2025 08:13:43 -0300
Subject: [PATCH] bloodspilot-client: move to by-name, modernize

---
 .../bloodspilot-sdl-window-fix.patch                   |  0
 .../bl/bloodspilot-client/package.nix}                 | 10 +++++-----
 pkgs/top-level/all-packages.nix                        |  1 -
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename pkgs/{games/xpilot => by-name/bl/bloodspilot-client}/bloodspilot-sdl-window-fix.patch (100%)
 rename pkgs/{games/xpilot/bloodspilot-client.nix => by-name/bl/bloodspilot-client/package.nix} (74%)

diff --git a/pkgs/games/xpilot/bloodspilot-sdl-window-fix.patch b/pkgs/by-name/bl/bloodspilot-client/bloodspilot-sdl-window-fix.patch
similarity index 100%
rename from pkgs/games/xpilot/bloodspilot-sdl-window-fix.patch
rename to pkgs/by-name/bl/bloodspilot-client/bloodspilot-sdl-window-fix.patch
diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/by-name/bl/bloodspilot-client/package.nix
similarity index 74%
rename from pkgs/games/xpilot/bloodspilot-client.nix
rename to pkgs/by-name/bl/bloodspilot-client/package.nix
index b87907a3a7f3..7436908119bb 100644
--- a/pkgs/games/xpilot/bloodspilot-client.nix
+++ b/pkgs/by-name/bl/bloodspilot-client/package.nix
@@ -12,13 +12,13 @@
   SDL_image,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "1.5.0";
   pname = "bloodspilot-client";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${version}/bloodspilot-client-sdl-${version}.tar.gz";
-    sha256 = "1qwl95av5an2zl01m7saj6fyy49xpixga7gbn4lwbpgpqs1rbwxj";
+    url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${finalAttrs.version}/bloodspilot-client-sdl-${finalAttrs.version}.tar.gz";
+    hash = "sha256-svOVg8b33cUpsesd9Xq8PRHvnZFKnxoA/cKqslVJlOM=";
   };
 
   patches = [ ./bloodspilot-sdl-window-fix.patch ];
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     mainProgram = "bloodspilot-client-sdl";
     homepage = "http://bloodspilot.sf.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.raskin ];
+    maintainers = with lib.maintainers; [ raskin ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d62dc543d9eb..a2941ea8f42c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13738,7 +13738,6 @@ with pkgs;
   xonotic-dedicated-unwrapped = xonotic-dedicated.xonotic-unwrapped;
 
   bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix { };
-  bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix { };
 
   inherit
     (callPackage ../games/quake2/yquake2 {