From 1710aeb1840c1df233db81aa46e4e76070e545ce Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 8 Sep 2024 11:21:35 +0200
Subject: [PATCH] box2d: move to pkgs/by-name

---
 .../bo/box2d/package.nix}                     | 33 +++++++------------
 pkgs/top-level/all-packages.nix               |  9 -----
 2 files changed, 11 insertions(+), 31 deletions(-)
 rename pkgs/{development/libraries/box2d/default.nix => by-name/bo/box2d/package.nix} (79%)

diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/by-name/bo/box2d/package.nix
similarity index 79%
rename from pkgs/development/libraries/box2d/default.nix
rename to pkgs/by-name/bo/box2d/package.nix
index 197d9313de27..deb842eb92ce 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/by-name/bo/box2d/package.nix
@@ -13,10 +13,6 @@
   xorgproto,
   libXi,
   pkg-config,
-  Carbon,
-  Cocoa,
-  Kernel,
-  OpenGL,
   settingsFile ? "include/box2d/b2_settings.h",
 }:
 
@@ -40,24 +36,17 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libGLU
-      libGL
-      libglut
-      libX11
-      libXcursor
-      libXinerama
-      libXrandr
-      xorgproto
-      libXi
-    ]
-    ++ optionals stdenv.hostPlatform.isDarwin [
-      Carbon
-      Cocoa
-      Kernel
-      OpenGL
-    ];
+  buildInputs = [
+    libGL
+    libGLU
+    libX11
+    libXcursor
+    libXi
+    libXinerama
+    libXrandr
+    libglut
+    xorgproto
+  ];
 
   cmakeFlags = [
     (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e695a90ed900..df92e6596b8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9012,15 +9012,6 @@ with pkgs;
     botan3
     ;
 
-  box2d = callPackage ../development/libraries/box2d {
-    inherit (darwin.apple_sdk.frameworks)
-      Carbon
-      Cocoa
-      Kernel
-      OpenGL
-      ;
-  };
-
   c-ares = callPackage ../development/libraries/c-ares { };
 
   c-aresMinimal = callPackage ../development/libraries/c-ares {