From 247bdeb02ff375f9ba4cc4b37f873446ad9e0d94 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:55:43 -0700
Subject: [PATCH] quakespasm: modernize, move to by-name/

---
 .../qu/quakespasm/package.nix}                   | 16 ++++++++--------
 ...quakespasm-darwin-makefile-improvements.patch |  0
 pkgs/{games => by-name/qu}/quakespasm/vulkan.nix |  0
 pkgs/top-level/all-packages.nix                  |  3 +--
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename pkgs/{games/quakespasm/default.nix => by-name/qu/quakespasm/package.nix} (90%)
 rename pkgs/{games => by-name/qu}/quakespasm/quakespasm-darwin-makefile-improvements.patch (100%)
 rename pkgs/{games => by-name/qu}/quakespasm/vulkan.nix (100%)

diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/by-name/qu/quakespasm/package.nix
similarity index 90%
rename from pkgs/games/quakespasm/default.nix
rename to pkgs/by-name/qu/quakespasm/package.nix
index 8b669b489773..d76476cce0e1 100644
--- a/pkgs/games/quakespasm/default.nix
+++ b/pkgs/by-name/qu/quakespasm/package.nix
@@ -20,16 +20,16 @@
   useSDL2 ? stdenv.hostPlatform.isDarwin, # TODO: CoreAudio fails to initialize with SDL 1.x for some reason.
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "quakespasm";
   version = "0.96.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz";
-    sha256 = "sha256-tXjWzkpPf04mokRY8YxLzI04VK5iUuuZgu6B2V5QGA4=";
+    url = "mirror://sourceforge/quakespasm/quakespasm-${finalAttrs.version}.tar.gz";
+    hash = "sha256-tXjWzkpPf04mokRY8YxLzI04VK5iUuuZgu6B2V5QGA4=";
   };
 
-  sourceRoot = "${pname}-${version}/Quake";
+  sourceRoot = "quakespasm-${finalAttrs.version}/Quake";
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [
     # Makes Darwin Makefile use system libraries instead of ones from app bundle
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Engine for iD software's Quake";
     homepage = "https://quakespasm.sourceforge.net/";
     longDescription = ''
@@ -125,8 +125,8 @@ stdenv.mkDerivation rec {
       and smoother mouse input - though no CD support.
     '';
 
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ mikroskeem ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ mikroskeem ];
     mainProgram = "quake";
   };
-}
+})
diff --git a/pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch b/pkgs/by-name/qu/quakespasm/quakespasm-darwin-makefile-improvements.patch
similarity index 100%
rename from pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch
rename to pkgs/by-name/qu/quakespasm/quakespasm-darwin-makefile-improvements.patch
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/by-name/qu/quakespasm/vulkan.nix
similarity index 100%
rename from pkgs/games/quakespasm/vulkan.nix
rename to pkgs/by-name/qu/quakespasm/vulkan.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c47c76a19619..ac4c21b29bea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13333,8 +13333,7 @@ with pkgs;
     quake3hires
     ;
 
-  quakespasm = callPackage ../games/quakespasm { };
-  vkquake = callPackage ../games/quakespasm/vulkan.nix { };
+  vkquake = callPackage ../by-name/qu/quakespasm/vulkan.nix { };
 
   rogue = callPackage ../games/rogue {
     ncurses = ncurses5;