From ccdc27d78cad18e5cd5fee8e65656d67b555c631 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 12:02:01 +0200
Subject: [PATCH] golly: move to by-name

---
 .../misc/golly/default.nix => by-name/go/golly/package.nix} | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{applications/science/misc/golly/default.nix => by-name/go/golly/package.nix} (95%)

diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/by-name/go/golly/package.nix
similarity index 95%
rename from pkgs/applications/science/misc/golly/default.nix
rename to pkgs/by-name/go/golly/package.nix
index b45a945fec46..1388a41d10b8 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/by-name/go/golly/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   wrapGAppsHook3,
-  wxGTK,
+  wxGTK32,
   python3,
   zlib,
   libGLU,
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    wxGTK
+    wxGTK32
     python3
     zlib
     libGLU
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     "CXX=${stdenv.cc.targetPrefix}c++"
     "CXXC=${stdenv.cc.targetPrefix}c++"
     "LD=${stdenv.cc.targetPrefix}c++"
-    "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK) "wx-config"}"
+    "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}"
   ];
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 843981ca7e6b..a39f82402cec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15260,10 +15260,6 @@ with pkgs;
 
   gplates = libsForQt5.callPackage ../applications/science/misc/gplates { };
 
-  golly = callPackage ../applications/science/misc/golly {
-    wxGTK = wxGTK32;
-  };
-
   megam = callPackage ../applications/science/misc/megam {
     inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
   };