From 8ef333a61fd251e9f4f9c39623ae0707a941deaf Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 9 Jun 2025 01:33:31 +0200
Subject: [PATCH] xlsclients: refactor and migrate to pkgs/by-name from xorg
 namespace

---
 pkgs/by-name/xl/xlsclients/package.nix        | 46 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 34 +-------------
 .../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, 50 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/by-name/xl/xlsclients/package.nix

diff --git a/pkgs/by-name/xl/xlsclients/package.nix b/pkgs/by-name/xl/xlsclients/package.nix
new file mode 100644
index 000000000000..d2cc35c2e9ca
--- /dev/null
+++ b/pkgs/by-name/xl/xlsclients/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libxcb,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xlsclients";
+  version = "1.1.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xlsclients-${finalAttrs.version}.tar.xz";
+    hash = "sha256-aLruV+cCUKxKd1n7eCIYMfl9iLyOUdzC5k6z+MpWuuM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ libxcb ];
+
+  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 = "Utility to list client applications running on a X11 display";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xlsclients";
+    license = with lib.licenses; [
+      mitOpenGroup
+      mit
+    ];
+    mainProgram = "xlsclients";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 15291853e339..954a63ca37d2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -26,6 +26,7 @@
   xdriinfo,
   xkeyboard-config,
   xlsatoms,
+  xlsclients,
   xorg-cf-files,
   xorg-docs,
   xorgproto,
@@ -51,6 +52,7 @@ self: with self; {
     xcmsdb
     xdriinfo
     xlsatoms
+    xlsclients
     xorgproto
     xtrans
     ;
@@ -6880,38 +6882,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xlsclients = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libxcb,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xlsclients";
-      version = "1.1.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xlsclients-1.1.5.tar.xz";
-        sha256 = "1qxsav5gicsfwv1dqlcfpj47vy9i30i7iysrfx5aql02wxbyxfk8";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [ libxcb ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xlsfonts = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 80bc58fb98f8..3524475cad1a 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -311,6 +311,7 @@ print OUT <<EOF;
   xdriinfo,
   xkeyboard-config,
   xlsatoms,
+  xlsclients,
   xorg-cf-files,
   xorg-docs,
   xorgproto,
@@ -336,6 +337,7 @@ self: with self; {
     xcmsdb
     xdriinfo
     xlsatoms
+    xlsclients
     xorgproto
     xtrans
     ;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 9e88be8f2fa5..b0d6d376d890 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1198,7 +1198,6 @@ self: super:
   xkbprint = addMainProgram super.xkbprint { };
   xkill = addMainProgram super.xkill { };
   xload = addMainProgram super.xload { };
-  xlsclients = addMainProgram super.xlsclients { };
   xmag = addMainProgram super.xmag { };
   xmessage = addMainProgram super.xmessage { };
   xmodmap = addMainProgram super.xmodmap { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 29566530d875..819e3e8cee2e 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -45,7 +45,6 @@ mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz
 mirror://xorg/individual/app/xkbutils-1.0.6.tar.xz
 mirror://xorg/individual/app/xkill-1.0.6.tar.xz
 mirror://xorg/individual/app/xload-1.2.0.tar.xz
-mirror://xorg/individual/app/xlsclients-1.1.5.tar.xz
 mirror://xorg/individual/app/xlsfonts-1.0.8.tar.xz
 mirror://xorg/individual/app/xmag-1.0.8.tar.xz
 mirror://xorg/individual/app/xmessage-1.0.7.tar.xz