From 10a2efa52e7974da4bffb17ab061c7a6f6bc64f4 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 05:19:33 +0200
Subject: [PATCH] xstdcmap: refactor and move to pkgs/by-name from xorg
 namespace

---
 pkgs/by-name/xs/xstdcmap/package.nix          | 55 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 59 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/by-name/xs/xstdcmap/package.nix

diff --git a/pkgs/by-name/xs/xstdcmap/package.nix b/pkgs/by-name/xs/xstdcmap/package.nix
new file mode 100644
index 000000000000..e47334435472
--- /dev/null
+++ b/pkgs/by-name/xs/xstdcmap/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxmu,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xstdcmap";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xstdcmap-${finalAttrs.version}.tar.xz";
+    hash = "sha256-NlhH43k5hJnsmtmimcxHoNbn/rqVRt/U5bQiIEtawYA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxmu
+  ];
+
+  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/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "X standard colormap utility";
+    longDescription = ''
+      The xstdcmap utility can be used to selectively define standard colormap properties.
+      It is intended to be run from a user's X startup script to create standard colormap
+      definitions in order to facilitate sharing of scarce colormap resources among clients using
+      PseudoColor visuals.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xstdcmap";
+    license = lib.licenses.mitOpenGroup;
+    mainProgram = "xstdcmap";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 54f068823f2f..a390b0fea1ae 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -85,6 +85,7 @@
   xset,
   xsetroot,
   xsm,
+  xstdcmap,
   xtrans,
   xvinfo,
   xwininfo,
@@ -132,6 +133,7 @@ self: with self; {
     xset
     xsetroot
     xsm
+    xstdcmap
     xtrans
     xvinfo
     xwininfo
@@ -5438,44 +5440,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xstdcmap = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXmu,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xstdcmap";
-      version = "1.0.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz";
-        sha256 = "1061b95j08mlwpadyilmpbzfgmm08z69k8nrkbn9k11rg7ilfn1n";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXmu
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xtrap = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 6a582098d527..81778df0f65b 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -401,6 +401,7 @@ print OUT <<EOF;
   xset,
   xsetroot,
   xsm,
+  xstdcmap,
   xtrans,
   xvinfo,
   xwininfo,
@@ -448,6 +449,7 @@ self: with self; {
     xset
     xsetroot
     xsm
+    xstdcmap
     xtrans
     xvinfo
     xwininfo
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0fc17ae3e277..12dae844dceb 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -982,7 +982,6 @@ self: super:
     };
   });
 
-  xstdcmap = addMainProgram super.xstdcmap { };
   xwd = addMainProgram super.xwd { };
 
   # convert Type1 vector fonts to OpenType fonts
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index a010fce5f5a8..75b92f122422 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -33,7 +33,6 @@ mirror://xorg/individual/app/xmessage-1.0.7.tar.xz
 mirror://xorg/individual/app/xmore-1.0.4.tar.xz
 mirror://xorg/individual/app/xpr-1.2.0.tar.xz
 mirror://xorg/individual/app/xrdb-1.2.2.tar.xz
-mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz
 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2
 mirror://xorg/individual/app/xwd-1.0.9.tar.xz
 mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz