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 81%
rename from pkgs/applications/science/electronics/gerbv/default.nix
rename to pkgs/by-name/ge/gerbv/package.nix
index 46a51950cda4..4ac18db31d22 100644
--- a/pkgs/applications/science/electronics/gerbv/default.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 = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    cairo
+    (cairo.override { x11Support = true; })
     gettext
     gtk2-x11
     libtool
@@ -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;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31fa0f68e73e..d5998de12685 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10422,10 +10422,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";