From b0887160e48a2d83eadc949e6af60cdc92f57f97 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Tue, 10 Sep 2024 20:58:14 -0400
Subject: [PATCH] eduke32: migrate to pkgs/by-name

---
 pkgs/{games => by-name/ed}/eduke32/convert-bmp-to-png.diff  | 0
 .../eduke32/default.nix => by-name/ed/eduke32/package.nix}  | 6 ++----
 pkgs/top-level/all-packages.nix                             | 4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)
 rename pkgs/{games => by-name/ed}/eduke32/convert-bmp-to-png.diff (100%)
 rename pkgs/{games/eduke32/default.nix => by-name/ed/eduke32/package.nix} (98%)

diff --git a/pkgs/games/eduke32/convert-bmp-to-png.diff b/pkgs/by-name/ed/eduke32/convert-bmp-to-png.diff
similarity index 100%
rename from pkgs/games/eduke32/convert-bmp-to-png.diff
rename to pkgs/by-name/ed/eduke32/convert-bmp-to-png.diff
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/by-name/ed/eduke32/package.nix
similarity index 98%
rename from pkgs/games/eduke32/default.nix
rename to pkgs/by-name/ed/eduke32/package.nix
index c213a6317b10..7c0f05c79784 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/by-name/ed/eduke32/package.nix
@@ -14,14 +14,12 @@
 , libGL
 , SDL2
 , SDL2_mixer
-, AGL
-, Cocoa
-, GLUT
-, OpenGL
+, darwin
 , graphicsmagick
 }:
 
 let
+  inherit (darwin.apple_sdk.frameworks) AGL Cocoa GLUT OpenGL;
   wrapper = "eduke32-wrapper";
   swWrapper = "voidsw-wrapper";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d80d39bedd7..9d7f987e2f7d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34970,10 +34970,6 @@ with pkgs;
 
   ecwolf = callPackage ../games/ecwolf { };
 
-  eduke32 = callPackage ../games/eduke32 {
-    inherit (darwin.apple_sdk.frameworks) AGL Cocoa GLUT OpenGL;
-  };
-
   egoboo = callPackage ../games/egoboo { };
 
   eidolon = callPackage ../games/eidolon { };