From 4eca8518d339168801d746c65f928ccdf0594a3e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 16 Oct 2024 10:27:49 +0100
Subject: [PATCH] xorg.xtrans: backport `xorg.libXfont` build fix

Without the change the build of `xorg.libXfont` fails as:

       > xtrans-1.5.1/include/X11/Xtrans/Xtrans.c: In function '_FontTransSelectTransport':
       > xtrans-1.5.1/include/X11/Xtrans/Xtrans.c:165:10: error: 'i' undeclared (first use in this function)
       >   165 |     for (i = 0; i < PROTOBUFSIZE && protobuf[i] != '\0'; i++)
       >       |          ^
---
 pkgs/servers/x11/xorg/overrides.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index ebf68e2680f5..128bd2d76ba3 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1123,6 +1123,15 @@ self: super:
   xsetroot = addMainProgram super.xsetroot { };
   xsm = addMainProgram super.xsm { };
   xstdcmap = addMainProgram super.xstdcmap { };
+  xtrans = super.xtrans.overrideAttrs (attrs: {
+    patches = [
+      # https://gitlab.freedesktop.org/xorg/lib/libxtrans/-/merge_requests/22
+      (fetchpatch {
+        url = "https://gitlab.freedesktop.org/xorg/lib/libxtrans/-/commit/ae99ac32f61e0db92a45179579030a23fe1b5770.patch";
+        hash = "sha256-QnTTcZPd9QaHS5up4Ne7iuNL/OBu+DnzXprovWnW4cw=";
+      })
+    ];
+  });
   xwd = addMainProgram super.xwd { };
   xwininfo = addMainProgram super.xwininfo { };
   xwud = addMainProgram super.xwud { };