From 483c48d27ba5097711f020774d478636c318183c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 1 Apr 2025 08:56:58 -0500
Subject: [PATCH] bzflag: Move to by-name

bzflag: Update source URL to use finalAttrs for versioning

bzflag: Remove unused dependencies Carbon and CoreServices

switch to pname

Change to recursive finalattrs to pick up pname and version.
---
 pkgs/by-name/bz/bzflag/package.nix | 43 ++++++++++++++++++++++++++
 pkgs/games/bzflag/default.nix      | 49 ------------------------------
 pkgs/top-level/all-packages.nix    |  4 ---
 3 files changed, 43 insertions(+), 53 deletions(-)
 create mode 100644 pkgs/by-name/bz/bzflag/package.nix
 delete mode 100644 pkgs/games/bzflag/default.nix

diff --git a/pkgs/by-name/bz/bzflag/package.nix b/pkgs/by-name/bz/bzflag/package.nix
new file mode 100644
index 000000000000..2871047c4001
--- /dev/null
+++ b/pkgs/by-name/bz/bzflag/package.nix
@@ -0,0 +1,43 @@
+{
+  stdenv,
+  lib,
+  fetchurl,
+  pkg-config,
+  curl,
+  SDL2,
+  libGLU,
+  libGL,
+  glew,
+  ncurses,
+  c-ares,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bzflag";
+  version = "2.4.30";
+
+  src = fetchurl {
+    url = "https://download.bzflag.org/bzflag/source/${finalAttrs.version}/bzflag-${finalAttrs.version}.tar.bz2";
+    sha256 = "sha256-u3i3UOe856p8Eb01kGuwikmsx8UL8pYprzgO7NFTiU0=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    curl
+    SDL2
+    libGLU
+    libGL
+    glew
+    ncurses
+    c-ares
+  ];
+
+  meta = {
+    description = "Multiplayer 3D Tank game";
+    homepage = "https://bzflag.org/";
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.unix;
+    maintainers = [ ];
+  };
+})
diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
deleted file mode 100644
index ce8c45cecbb1..000000000000
--- a/pkgs/games/bzflag/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  pkg-config,
-  curl,
-  SDL2,
-  libGLU,
-  libGL,
-  glew,
-  ncurses,
-  c-ares,
-  Carbon,
-  CoreServices,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "bzflag";
-  version = "2.4.30";
-
-  src = fetchurl {
-    url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-u3i3UOe856p8Eb01kGuwikmsx8UL8pYprzgO7NFTiU0=";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      curl
-      SDL2
-      libGLU
-      libGL
-      glew
-      ncurses
-      c-ares
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      Carbon
-      CoreServices
-    ];
-
-  meta = with lib; {
-    description = "Multiplayer 3D Tank game";
-    homepage = "https://bzflag.org/";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.unix;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a97b6675c303..0d8bb35de04a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17262,10 +17262,6 @@ with pkgs;
     inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL;
   };
 
-  bzflag = callPackage ../games/bzflag {
-    inherit (darwin.apple_sdk.frameworks) Carbon CoreServices;
-  };
-
   cataclysmDDA = callPackage ../games/cataclysm-dda { };
 
   cataclysm-dda = cataclysmDDA.stable.tiles;