From fcfd8d87882e924479ba3395c02c701c041511c9 Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Fri, 27 May 2022 14:26:03 +0200
Subject: [PATCH 1/2] xwayland: 22.1.1 -> 22.1.3

Version bump:
22.1.3:
- fix two XKB security vulnerabilities
22.1.2:
- fix an invalid pointer access in drm_lease_handle_device
- Add and set RANDR emulation

(cherry picked from commit 21a1bff4638b812d74c9bb125b57ed2b1d2f27c4)
---
 pkgs/servers/x11/xorg/xwayland.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 97414481a915..50210a791029 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -44,10 +44,10 @@
 stdenv.mkDerivation rec {
 
   pname = "xwayland";
-  version = "22.1.1";
+  version = "22.1.3";
   src = fetchurl {
     url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
-    sha256 = "sha256-9dDgujfhm7h8YvYdpZcL0gSTnyEgYglkvtTMhJW6plc=";
+    sha256 = "sha256-pxLre84yzZNN82gUtd0EaqZwiZwW/pjyr7ADV4+GocU=";
   };
 
   depsBuildBuild = [

From 81f1dcb03494592134fbc5e97a77c8f59dc7e23c Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Sat, 23 Jul 2022 21:21:13 +0200
Subject: [PATCH 2/2] Apply suggestions from code review

(cherry picked from commit 5061ccd1c2bee119b6896e0ef2a59ddd498b6a61)
---
 pkgs/servers/x11/xorg/xwayland.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 50210a791029..134e992a56c8 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -42,9 +42,9 @@
 , defaultFontPath ? "" }:
 
 stdenv.mkDerivation rec {
-
   pname = "xwayland";
   version = "22.1.3";
+
   src = fetchurl {
     url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
     sha256 = "sha256-pxLre84yzZNN82gUtd0EaqZwiZwW/pjyr7ADV4+GocU=";