From 150f609e537b4a5a04ac1a71619bb529ad88e667 Mon Sep 17 00:00:00 2001
From: Matthew_Cash
Date: Sat, 15 Jun 2024 16:30:08 -0700
Subject: xwayland: cherry-pick patch to fix segfault when linux-dmabuf device
 is not accessible

Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1565
---
 pkgs/servers/x11/xorg/xwayland.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 7e2cc2fdcb4f..11913a39e017 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 = [
-- 
cgit 1.4.1