From a06a1a61a1db22bd168e90226414cc35c4bcd0d9 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 25 Sep 2024 17:55:13 -0300
Subject: [PATCH] galculator: migrate to by-name

---
 .../default.nix => by-name/ga/galculator/package.nix}     | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/misc/galculator/default.nix => by-name/ga/galculator/package.nix} (88%)

diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/by-name/ga/galculator/package.nix
similarity index 88%
rename from pkgs/applications/misc/galculator/default.nix
rename to pkgs/by-name/ga/galculator/package.nix
index ef45224a83ce..115a587dd320 100644
--- a/pkgs/applications/misc/galculator/default.nix
+++ b/pkgs/by-name/ga/galculator/package.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch
 , autoreconfHook, intltool
-, gtk, pkg-config, flex }:
+, gtk3, pkg-config, flex }:
 
 stdenv.mkDerivation rec {
   pname = "galculator";
@@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ autoreconfHook intltool pkg-config ];
-  buildInputs = [ gtk flex ];
+  buildInputs = [ gtk3 flex ];
 
   meta = with lib; {
-    description = "GTK 2/3 algebraic and RPN calculator";
+    description = "GTK algebraic and RPN calculator";
     longDescription = ''
-      galculator is a GTK 2 / GTK 3 based calculator. Its main features include:
+      galculator is a GTK-based calculator. Its main features include:
 
       - Algebraic, RPN (Reverse Polish Notation), Formula Entry and Paper modes;
       - Basic and Scientific Modes
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e0dffbeec0a..75e4164a5b3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7836,10 +7836,6 @@ with pkgs;
 
   uniscribe = callPackage ../tools/text/uniscribe { };
 
-  galculator = callPackage ../applications/misc/galculator {
-    gtk = gtk3;
-  };
-
   fornalder = callPackage ../applications/version-management/fornalder { };
 
   galen = callPackage ../development/tools/galen { };