From c89d34d7728b0d89778f390cc09c15b3b9b51c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?=
 <spamfaenger@gmx.de>
Date: Sat, 22 Mar 2025 09:05:06 +0100
Subject: [PATCH] quake3: move all the files into a set to make visible that
 they belong together

This also neatly avoids the warning by nipkgs-vet
---
 pkgs/games/quake3/default.nix   | 46 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix | 54 +++++++--------------------------
 2 files changed, 57 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/games/quake3/default.nix

diff --git a/pkgs/games/quake3/default.nix b/pkgs/games/quake3/default.nix
new file mode 100644
index 000000000000..62f1dc055678
--- /dev/null
+++ b/pkgs/games/quake3/default.nix
@@ -0,0 +1,46 @@
+callPackage: rec {
+  # main entry point to create a runnable quake3
+  quake3wrapper = callPackage ./wrapper { };
+
+  # data files
+  quake3arenadata = callPackage ./content/arena.nix { };
+  quake3demodata = callPackage ./content/demo.nix { };
+  quake3pointrelease = callPackage ./content/pointrelease.nix { };
+  quake3hires = callPackage ./content/hires.nix { };
+
+  # runnable quakes with different configurations / mods
+
+  quake3arena = quake3wrapper {
+    pname = "quake3";
+    paks = [
+      quake3arenadata
+      quake3pointrelease
+    ];
+  };
+
+  quake3arena-hires = quake3wrapper {
+    pname = "quake3";
+    paks = [
+      quake3arenadata
+      quake3pointrelease
+      quake3hires
+    ];
+  };
+
+  quake3demo = quake3wrapper {
+    pname = "quake3-demo";
+    paks = [
+      quake3demodata
+      quake3pointrelease
+    ];
+  };
+
+  quake3demo-hires = quake3wrapper {
+    pname = "quake3-demo";
+    paks = [
+      quake3demodata
+      quake3pointrelease
+      quake3hires
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cf229441208..8d43eab9139b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15173,49 +15173,17 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  quake3wrapper = callPackage ../games/quake3/wrapper { };
-
-  quake3arena = quake3wrapper {
-    pname = "quake3";
-    paks = [
-      quake3arenadata
-      quake3pointrelease
-    ];
-  };
-
-  quake3arena-hires = quake3wrapper {
-    pname = "quake3";
-    paks = [
-      quake3arenadata
-      quake3pointrelease
-      quake3hires
-    ];
-  };
-
-  quake3demo = quake3wrapper {
-    pname = "quake3-demo";
-    paks = [
-      quake3demodata
-      quake3pointrelease
-    ];
-  };
-
-  quake3demo-hires = quake3wrapper {
-    pname = "quake3-demo";
-    paks = [
-      quake3demodata
-      quake3pointrelease
-      quake3hires
-    ];
-  };
-
-  quake3arenadata = callPackage ../games/quake3/content/arena.nix { };
-
-  quake3demodata = callPackage ../games/quake3/content/demo.nix { };
-
-  quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { };
-
-  quake3hires = callPackage ../games/quake3/content/hires.nix { };
+  inherit (import ../games/quake3 pkgs.callPackage)
+    quake3wrapper
+    quake3arenadata
+    quake3demodata
+    quake3pointrelease
+    quake3arena
+    quake3arena-hires
+    quake3demo
+    quake3demo-hires
+    quake3hires
+    ;
 
   quakespasm = callPackage ../games/quakespasm { };
   vkquake = callPackage ../games/quakespasm/vulkan.nix { };