xorg.libX11: Fix spurious Xerror when running synchronized

This backports https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/264.

This fixes 'XIO: fatal IO error 9 (Bad file descriptor) on X server
":102"' when GNOME's mutter is tearing down.

ref: ddc5e3368d
ref: f88b54502c
(cherry picked from commit 6ac7c0c4d0)
(cherry picked from commit 9b1475f9c4)
This commit is contained in:
Bobby Rong 2024-11-10 09:49:25 +08:00 committed by Vladimír Čunát
parent 262a7c4efe
commit a1868a1013
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -149,6 +149,14 @@ self: super:
libX11 = super.libX11.overrideAttrs (attrs: {
outputs = [ "out" "dev" "man" ];
patches = [
# Fix spurious Xerror when running synchronized
# https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/264
(fetchpatch {
url = "https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/f3d6ebac35301d4ad068e307f0fbe6aa12ccbccb.patch";
hash = "sha256-wQNMsbQ+h9VlNiWr+r34AxvViC8fq02ZhcARRnw7O9k=";
})
];
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag
++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp";