From 4cc23fda05f8f6fa442a1472f0d33c869c3d8a5a Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Tue, 31 Dec 2024 16:39:28 +0100
Subject: [PATCH] libpthread-stubs: refactored, moved to pkgs/by-name and
 renamed from xorg.libpthreadstubs

---
 pkgs/by-name/li/libpthread-stubs/package.nix  | 43 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 33 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 ++
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 48 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/li/libpthread-stubs/package.nix

diff --git a/pkgs/by-name/li/libpthread-stubs/package.nix b/pkgs/by-name/li/libpthread-stubs/package.nix
new file mode 100644
index 000000000000..8ad5577de7b6
--- /dev/null
+++ b/pkgs/by-name/li/libpthread-stubs/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  testers,
+  writeScript,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libpthread-stubs";
+  version = "0.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libpthread-stubs-${finalAttrs.version}.tar.xz";
+    hash = "sha256-WdpWbezOunwqeXCkoDtI2ZBfEmL/lEEKZJIk4z0kQrw=";
+  };
+
+  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/lib/ \
+        | sort -V | tail -n1)"
+
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Provides a pkg-config file `pthread-stubs.pc` containing the Cflags/Libs flags applicable to programs/libraries that use only lightweight pthread API";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/pthread-stubs";
+    # gitlab says x11-distribute-modifications but it's not
+    # maybe due to https://github.com/spdx/spdx-online-tools/issues/540
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "pthread-stubs" ];
+    # on these platforms according to the readme
+    platforms = with lib.platforms; linux ++ cygwin ++ darwin ++ [ "x86_64-solaris" ];
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0eea13eb658e..0bdcf2653c85 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -5,6 +5,7 @@
   font-util,
   gccmakedep,
   libpciaccess,
+  libpthread-stubs,
   luit,
   pixman,
 }:
@@ -19,6 +20,7 @@ self: with self; {
     ;
   fontalias = font-alias;
   fontutil = font-util;
+  libpthreadstubs = libpthread-stubs;
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   appres = callPackage (
@@ -3199,37 +3201,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libpthreadstubs = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libpthread-stubs";
-      version = "0.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/xcb/libpthread-stubs-0.5.tar.xz";
-        sha256 = "1g224hyy694jch54357zc895z46r90xs193hg4m7rfnfxinmdnjr";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [ ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "pthread-stubs" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libxcb = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 1d94ca12b828..3a58856b599d 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -38,6 +38,7 @@ $pcMap{"gbm"} = "libgbm";
 $pcMap{"hwdata"} = "hwdata";
 $pcMap{"fontutil"} = "fontutil";
 $pcMap{"pciaccess"} = "libpciaccess";
+$pcMap{"pthread-stubs"} = "libpthreadstubs";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "xorgproto";
 $pcMap{"\$DRI3PROTO"} = "xorgproto";
@@ -266,6 +267,7 @@ print OUT <<EOF;
   font-util,
   gccmakedep,
   libpciaccess,
+  libpthread-stubs,
   luit,
   pixman,
 }:
@@ -280,6 +282,7 @@ self: with self; {
     ;
   fontalias = font-alias;
   fontutil = font-util;
+  libpthreadstubs = libpthread-stubs;
 
 EOF
 
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index eb0f9bc1c2ae..6d621b4cbef5 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -620,13 +620,6 @@ self: super:
     ]; # mainly to avoid propagation
   });
 
-  libpthreadstubs = super.libpthreadstubs.overrideAttrs (attrs: {
-    # only contains a pkgconfig file on linux and windows
-    meta = attrs.meta // {
-      platforms = lib.platforms.unix ++ lib.platforms.windows;
-    };
-  });
-
   setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
     postInstall = ''
       mkdir -p $out/share/man/man7
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index e0564bc64196..47ae0e74d88e 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -1,4 +1,3 @@
-mirror://xorg/individual/xcb/libpthread-stubs-0.5.tar.xz
 mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz
 mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz
 mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz