From 214ef50a2a7310b5b2d382d3f6906ccbe36f40f8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 11 Sep 2024 18:59:48 +0200
Subject: [PATCH 1/3] sauerbraten: format with nixfmt

---
 pkgs/games/sauerbraten/default.nix | 36 +++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix
index b32ffadaea16..f23b1a296846 100644
--- a/pkgs/games/sauerbraten/default.nix
+++ b/pkgs/games/sauerbraten/default.nix
@@ -1,13 +1,14 @@
-{ lib
-, stdenv
-, fetchzip
-, SDL2
-, SDL2_image
-, SDL2_mixer
-, zlib
-, makeWrapper
-, copyDesktopItems
-, makeDesktopItem
+{
+  lib,
+  stdenv,
+  fetchzip,
+  SDL2,
+  SDL2_image,
+  SDL2_mixer,
+  zlib,
+  makeWrapper,
+  copyDesktopItems,
+  makeDesktopItem,
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +16,9 @@ stdenv.mkDerivation rec {
   version = "2020-12-27";
 
   src = fetchzip {
-    url = "mirror://sourceforge/sauerbraten/sauerbraten_${builtins.replaceStrings [ "-" ] [ "_" ] version}_linux.tar.bz2";
+    url = "mirror://sourceforge/sauerbraten/sauerbraten_${
+      builtins.replaceStrings [ "-" ] [ "_" ] version
+    }_linux.tar.bz2";
     sha256 = "0llknzj23vx6f3y452by9c7wlhzclyq4bqi22qd52m3l916z2mn5";
   };
 
@@ -42,7 +45,11 @@ stdenv.mkDerivation rec {
       icon = "sauerbraten";
       desktopName = "Sauerbraten";
       comment = "FPS that uses an improved version of the Cube engine";
-      categories = [ "Application" "Game" "ActionGame" ];
+      categories = [
+        "Application"
+        "Game"
+        "ActionGame"
+      ];
     })
   ];
 
@@ -67,7 +74,10 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Free multiplayer & singleplayer first person shooter, the successor of the Cube FPS";
     homepage = "http://sauerbraten.org";
-    maintainers = with maintainers; [ raskin ajs124 ];
+    maintainers = with maintainers; [
+      raskin
+      ajs124
+    ];
     mainProgram = "sauerbraten_client";
     hydraPlatforms =
       # raskin: tested amd64-linux;

From 664e6d6b18ef194fcdfb8807284d97c5983d4af7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 11 Sep 2024 19:01:06 +0200
Subject: [PATCH 2/3] sauerbraten: move to pkgs/by-name

---
 .../default.nix => by-name/sa/sauerbraten/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{games/sauerbraten/default.nix => by-name/sa/sauerbraten/package.nix} (100%)

diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/by-name/sa/sauerbraten/package.nix
similarity index 100%
rename from pkgs/games/sauerbraten/default.nix
rename to pkgs/by-name/sa/sauerbraten/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03be6c25f504..2571984d8779 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35989,8 +35989,6 @@ with pkgs;
     openjdk = openjdk8;
   };
 
-  sauerbraten = callPackage ../games/sauerbraten { };
-
   scid = callPackage ../games/scid { };
 
   scid-vs-pc = callPackage ../games/scid-vs-pc { };

From 04f2bef003cd6d440cc233aa116fe3a2f1288735 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 11 Sep 2024 19:02:57 +0200
Subject: [PATCH 3/3] sauerbraten: 2020-12-27 -> 2020-12-29

---
 pkgs/by-name/sa/sauerbraten/package.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/sa/sauerbraten/package.nix b/pkgs/by-name/sa/sauerbraten/package.nix
index f23b1a296846..2951641fbf5f 100644
--- a/pkgs/by-name/sa/sauerbraten/package.nix
+++ b/pkgs/by-name/sa/sauerbraten/package.nix
@@ -2,24 +2,29 @@
   lib,
   stdenv,
   fetchzip,
+
+  # nativeBuildInputs
+  makeWrapper,
+  copyDesktopItems,
+
+  # buildInputs
   SDL2,
   SDL2_image,
   SDL2_mixer,
   zlib,
-  makeWrapper,
-  copyDesktopItems,
+
   makeDesktopItem,
 }:
 
 stdenv.mkDerivation rec {
   pname = "sauerbraten";
-  version = "2020-12-27";
+  version = "2020-12-29";
 
   src = fetchzip {
     url = "mirror://sourceforge/sauerbraten/sauerbraten_${
       builtins.replaceStrings [ "-" ] [ "_" ] version
     }_linux.tar.bz2";
-    sha256 = "0llknzj23vx6f3y452by9c7wlhzclyq4bqi22qd52m3l916z2mn5";
+    hash = "sha256-os3SmonqHRw1+5dIRVt7EeXfnSq298GiyKpusS1K3rM=";
   };
 
   nativeBuildInputs = [
@@ -29,8 +34,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     SDL2
-    SDL2_mixer
     SDL2_image
+    SDL2_mixer
     zlib
   ];
 
@@ -71,10 +76,10 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Free multiplayer & singleplayer first person shooter, the successor of the Cube FPS";
     homepage = "http://sauerbraten.org";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       raskin
       ajs124
     ];
@@ -84,6 +89,6 @@ stdenv.mkDerivation rec {
       # not setting platforms because it is 0.5+ GiB of game data
       [ ];
     license = "freeware"; # as an aggregate - data files have different licenses code is under zlib license
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }