diff --git a/pkgs/by-name/gc/gccmakedep/package.nix b/pkgs/by-name/gc/gccmakedep/package.nix
new file mode 100644
index 000000000000..daa63e40bfd2
--- /dev/null
+++ b/pkgs/by-name/gc/gccmakedep/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  writeScript,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gccmakedep";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/util/gccmakedep-${finalAttrs.version}.tar.xz";
+    hash = "sha256-UIj5h2n7Y8Mm6bnSy3yfSmMKKAHdHaBpcdCCkXbPJbY=";
+  };
+
+  passthru.updateScript = writeScript "update-${finalAttrs.pname}" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -i bash -p common-updater-scripts
+
+    version="$(list-directory-versions --pname ${finalAttrs.pname} \
+      --url https://xorg.freedesktop.org/releases/individual/util/ \
+      | sort -V | tail -n1)"
+
+    update-source-version ${finalAttrs.pname} "$version"
+  '';
+
+  meta = {
+    description = "Creates dependencies in makefiles using 'gcc -M'";
+    homepage = "https://gitlab.freedesktop.org/xorg/util/gccmakedep";
+    license = with lib.licenses; [
+      # COPYING file suggests looking at the Copyright headers of every file:
+      # upstream issue: https://gitlab.freedesktop.org/xorg/util/gccmakedep/-/issues/1
+
+      # 1. build system files Copyright Red Hat
+      hpndSellVariant
+
+      # 2. gccmakedep.man was written by Colin Watson for Debian somewhen
+      # earlier than November 2003. While I wasn't able to trace the exact
+      # source, between 1997 and 2004 the "Debian Social Contract, Version
+      # 1.0" was in effect, which requires all components of the Debian
+      # Operating System to be free software, which includes this man page.
+      # https://www.debian.org/social_contract.1.0
+      free
+
+      # 3. gccmakedep.in, originally named gccmdep.cpp was copied from the
+      # XFree86 project around 2000. While it states to be "Based on
+      # mdepend.cpp and code supplied by Hongjiu Lu", that doesn't matter
+      # because it was supposedly completely rewritten by XFree86.
+      # XFree86 code without any explicit Copyright Statement is under X11.
+      x11
+
+      # 4. some files don't have any license info, but they are all trivial
+    ];
+    mainProgram = "gccmakedep";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 7f4c518a4091..133b26c65f80 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -3,14 +3,18 @@
   lib,
   font-alias,
   font-util,
+  gccmakedep,
   luit,
   pixman,
 }:
 
 self: with self; {
 
-  inherit pixman;
-  inherit luit;
+  inherit
+    gccmakedep
+    luit
+    pixman
+    ;
   fontalias = font-alias;
   fontutil = font-util;
 
@@ -1645,37 +1649,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  gccmakedep = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "gccmakedep";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/util/gccmakedep-1.0.4.tar.xz";
-        sha256 = "1di5rxv930nhf5ls07fx04l0lqsakxycplmrx4kc6qzvd63zk22h";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [ ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   iceauth = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 3eb2080cc17f..c03bd8383dff 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -263,14 +263,18 @@ print OUT <<EOF;
   lib,
   font-alias,
   font-util,
+  gccmakedep,
   luit,
   pixman,
 }:
 
 self: with self; {
 
-  inherit pixman;
-  inherit luit;
+  inherit
+    gccmakedep
+    luit
+    pixman
+    ;
   fontalias = font-alias;
   fontutil = font-util;
 
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8c72f10418ed..588e28a9f113 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -157,7 +157,6 @@ self: super:
     };
   });
 
-  gccmakedep = addMainProgram super.gccmakedep { };
   iceauth = addMainProgram super.iceauth { };
   ico = addMainProgram super.ico { };
 
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 9546ea6de0f2..5e8b4fdbd5f7 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -209,7 +209,6 @@ mirror://xorg/individual/lib/xtrans-1.6.0.tar.xz
 mirror://xorg/individual/proto/xcb-proto-1.17.0.tar.xz
 mirror://xorg/individual/proto/xorgproto-2024.1.tar.xz
 mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz
-mirror://xorg/individual/util/gccmakedep-1.0.4.tar.xz
 mirror://xorg/individual/util/imake-1.0.10.tar.xz
 mirror://xorg/individual/util/lndir-1.0.5.tar.xz
 mirror://xorg/individual/util/makedepend-1.0.9.tar.xz