From b695c080716d14ac9bdfe7e62776608abc0c3b60 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 22 Apr 2026 20:00:20 -0500
Subject: [PATCH 1/2] gerbv: migrate to by-name

---
 .../ge}/gerbv/0001-fix-invalid-function-signatures.patch      | 0
 .../gerbv/default.nix => by-name/ge/gerbv/package.nix}        | 2 +-
 pkgs/top-level/all-packages.nix                               | 4 ----
 3 files changed, 1 insertion(+), 5 deletions(-)
 rename pkgs/{applications/science/electronics => by-name/ge}/gerbv/0001-fix-invalid-function-signatures.patch (100%)
 rename pkgs/{applications/science/electronics/gerbv/default.nix => by-name/ge/gerbv/package.nix} (96%)

diff --git a/pkgs/applications/science/electronics/gerbv/0001-fix-invalid-function-signatures.patch b/pkgs/by-name/ge/gerbv/0001-fix-invalid-function-signatures.patch
similarity index 100%
rename from pkgs/applications/science/electronics/gerbv/0001-fix-invalid-function-signatures.patch
rename to pkgs/by-name/ge/gerbv/0001-fix-invalid-function-signatures.patch
diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/by-name/ge/gerbv/package.nix
similarity index 96%
rename from pkgs/applications/science/electronics/gerbv/default.nix
rename to pkgs/by-name/ge/gerbv/package.nix
index 46a51950cda4..1d7c53812a38 100644
--- a/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/pkgs/by-name/ge/gerbv/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    cairo
+    (cairo.override { x11Support = true; })
     gettext
     gtk2-x11
     libtool
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aabb698ddef4..a8942e5dd3e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10471,10 +10471,6 @@ with pkgs;
   simulide_1_1_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.1.0"; };
   simulide_1_2_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.2.0"; };
 
-  gerbv = callPackage ../applications/science/electronics/gerbv {
-    cairo = cairo.override { x11Support = true; };
-  };
-
   # this is the same but without the (sizable) 3D models library
   kicad-small = kicad.override {
     pname = "kicad-small";

From fb65ae7fbcfff316e8f484ad0ef12799d68aef7c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 22 Apr 2026 20:01:31 -0500
Subject: [PATCH 2/2] gerbv: modernize derivation

---
 pkgs/by-name/ge/gerbv/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ge/gerbv/package.nix b/pkgs/by-name/ge/gerbv/package.nix
index 1d7c53812a38..4ac18db31d22 100644
--- a/pkgs/by-name/ge/gerbv/package.nix
+++ b/pkgs/by-name/ge/gerbv/package.nix
@@ -12,14 +12,14 @@
   pkg-config,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gerbv";
   version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "gerbv";
     repo = "gerbv";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-sr48RGLYcMKuyH9p+5BhnR6QpKBvNOqqtRryw3+pbBk=";
   };
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    sed -i '/AC_INIT/s/m4_esyscmd.*/${version}])/' configure.ac
+    sed -i '/AC_INIT/s/m4_esyscmd.*/${finalAttrs.version}])/' configure.ac
   '';
 
   nativeBuildInputs = [
@@ -53,9 +53,9 @@ stdenv.mkDerivation rec {
     description = "Gerber (RS-274X) viewer";
     mainProgram = "gerbv";
     homepage = "https://gerbv.github.io/";
-    changelog = "https://github.com/gerbv/gerbv/releases/tag/v${version}";
+    changelog = "https://github.com/gerbv/gerbv/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ mog ];
     platforms = lib.platforms.unix;
   };
-}
+})