diff options
| author | K900 <me@0upti.me> | 2024-06-16 08:18:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-16 08:18:33 +0300 |
| commit | 077deb8f7063b821e425098e75454a5f95121ef8 (patch) | |
| tree | a3255d8857e5c1ffe70aeea0db6ab21260d54835 | |
| parent | b22435d8fac9904352ca3b9b0c21aaebae52c36d (diff) | |
| parent | 150f609e537b4a5a04ac1a71619bb529ad88e667 (diff) | |
Merge pull request #320157 from MatthewCash/fix/xwayland-missing-dmabuf-segfault-patch
xwayland: add patch to fix segfault when dmabuf device is missing
| -rw-r--r-- | pkgs/servers/x11/xorg/xwayland.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 7e2cc2fdcb4f1..11913a39e017b 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -64,6 +64,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/8cb1c21a4240a5b6bf4aeeef51819639b4e0ad24.patch"; hash = "sha256-MZPP9QgYO4RFJ/vcjkpu7SVSo5Dh09ZdZjOwTopjdYQ="; }) + # Backport fix for segfault when linux-dmabuf device is not accessible + # FIXME: remove when merged + # Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1565 + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/7605833315c05488eca30ed0a70a2a1430e89bbc.patch"; + hash = "sha256-4/A6aOiOGouPe2v4wIYDQY9rWkuNZJwk0h4gpfrl6hI="; + }) ]; depsBuildBuild = [ |