summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-03-31 12:02:10 +0000
committerGitHub <noreply@github.com>2022-03-31 12:02:10 +0000
commit9aa014c46a227ba5d0223851e8b0386f0869aa23 (patch)
treefe8c9aa62289b371d9edbfe88273025fc2144607 /pkgs/servers/x11
parent22c23dbb8de9969e8c9b898a06d2f36b10d0b809 (diff)
parentac5a927919638e6a9c69cd35084c7e7801472498 (diff)
downloadnixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.tar
nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.tar.gz
nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.tar.bz2
nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.tar.lz
nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.tar.xz
nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.tar.zst
nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/xwayland.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 851e16beb3f..53dfdc529cb 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -23,6 +23,7 @@
 , libxcb
 , libxkbfile
 , libxshmfence
+, libxcvt
 , mesa
 , meson
 , ninja
@@ -43,10 +44,10 @@
 stdenv.mkDerivation rec {
 
   pname = "xwayland";
-  version = "21.1.4";
+  version = "22.1.0";
   src = fetchurl {
     url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
-    sha256 = "sha256-GfZ5XzHPqOs1Kx5bPDefIu5gIOmHAf8sxnnajE8RWfc=";
+    sha256 = "sha256-F1LW0Kkw5xKStaMI04EevVTYzGjKz/RN5lQmW4YXor8=";
   };
 
   depsBuildBuild = [
@@ -82,6 +83,7 @@ stdenv.mkDerivation rec {
     libxcb
     libxkbfile
     libxshmfence
+    libxcvt
     mesa
     openssl
     pixman