From 4cac24df2a0cf5492593f5a3b7dc711c047db9b6 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 17 Jan 2026 10:35:20 -0600
Subject: [PATCH] openbox-menu: migrate to pkgs/by-name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This moves openbox-menu to the by-name directory structure:

  pkgs/applications/misc/openbox-menu → pkgs/by-name/op/openbox-menu

Changes included in this migration:

- switch from stdenv.mkDerivation to gccStdenv.mkDerivation
  (matching the previous override in all-packages.nix)
- update to finalAttrs style
- convert sha256 to hash = "sha256-…"
- update references from stdenv.* to gccStdenv.*
- remove the old all-packages.nix entry
---
 .../op}/openbox-menu/000-enable-svg.patch          |  0
 .../op/openbox-menu/package.nix}                   | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  4 ----
 3 files changed, 7 insertions(+), 11 deletions(-)
 rename pkgs/{applications/misc => by-name/op}/openbox-menu/000-enable-svg.patch (100%)
 rename pkgs/{applications/misc/openbox-menu/default.nix => by-name/op/openbox-menu/package.nix} (78%)

diff --git a/pkgs/applications/misc/openbox-menu/000-enable-svg.patch b/pkgs/by-name/op/openbox-menu/000-enable-svg.patch
similarity index 100%
rename from pkgs/applications/misc/openbox-menu/000-enable-svg.patch
rename to pkgs/by-name/op/openbox-menu/000-enable-svg.patch
diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/by-name/op/openbox-menu/package.nix
similarity index 78%
rename from pkgs/applications/misc/openbox-menu/default.nix
rename to pkgs/by-name/op/openbox-menu/package.nix
index d55359b66401..cb2995c4146b 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/by-name/op/openbox-menu/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  gccStdenv,
   fetchurl,
   pkg-config,
   glib,
@@ -8,13 +8,13 @@
   menu-cache,
 }:
 
-stdenv.mkDerivation rec {
+gccStdenv.mkDerivation (finalAttrs: {
   pname = "openbox-menu";
   version = "0.8.0";
 
   src = fetchurl {
-    url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${pname}-${version}.tar.bz2";
-    sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l";
+    url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/openbox-menu-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-FPHghHwVES6bSBUqNeNRUA0x55pRQ0iwVMafhKtZJMI=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
   patches = [ ./000-enable-svg.patch ];
 
   # The strip options are not recognized by Darwin.
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = lib.optionalString gccStdenv.hostPlatform.isDarwin ''
     sed -i -e '/strip -s/d' Makefile
   '';
 
-  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+  makeFlags = [ "CC=${gccStdenv.cc.targetPrefix}cc" ];
 
   installFlags = [ "prefix=${placeholder "out"}" ];
 
@@ -49,4 +49,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     mainProgram = "openbox-menu";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 566cb5480b7c..52daaab4b810 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11290,10 +11290,6 @@ with pkgs;
 
   openambit = qt5.callPackage ../applications/misc/openambit { };
 
-  openbox-menu = callPackage ../applications/misc/openbox-menu {
-    stdenv = gccStdenv;
-  };
-
   openbrf = libsForQt5.callPackage ../applications/misc/openbrf { };
 
   opencpn = callPackage ../applications/misc/opencpn {