From 198b38f54d38f3a6031ea9932f133ee06ab19203 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 24 Sep 2022 10:06:09 +0000
Subject: [PATCH] weston: 10.0.1 -> 11.0.0

---
 .../window-managers/weston/default.nix        | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 58e627250483..f383e3c85aeb 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl
 , meson, ninja, pkg-config, python3, wayland-scanner
 , cairo, colord, dbus, lcms2, libGL, libXcursor, libdrm, libevdev, libinput
-, libjpeg, libxcb, libxkbcommon, mesa, mtdev, pam, udev, wayland
+, libjpeg, libseat, libxcb, libxkbcommon, mesa, mtdev, pam, udev, wayland
 , wayland-protocols, xlibsWrapper
 , pipewire ? null, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null
 , libva ? null, libwebp ? null, xwayland ? null
@@ -10,26 +10,18 @@
 
 stdenv.mkDerivation rec {
   pname = "weston";
-  version = "10.0.1";
+  version = "11.0.0";
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz";
-    sha256 = "05a10gfbadyxkwgsncc5vc343f493csgh10vk0878nl6d98557la";
+    sha256 = "078y14ff9wmmbzq314f7bq1bxx0rc12xy4j362n60iamr56qs4x6";
   };
 
-  patches = [
-    # Fix race condition in build system
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/0d3e438d080433ed5d203c876e7de6c7f8a14f98.patch";
-      sha256 = "sha256-d9NG1vUIuL4jpXqCo0myz/97JuFYesH+8kJnegQXeMU=";
-    })
-  ];
-
   nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ];
   buildInputs = [
     cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput
-    libjpeg libunwind libva libwebp libxcb libxkbcommon mesa mtdev pam pango
-    pipewire udev vaapi wayland wayland-protocols xlibsWrapper
+    libjpeg libseat libunwind libva libwebp libxcb libxkbcommon mesa mtdev pam
+    pango pipewire udev vaapi wayland wayland-protocols xlibsWrapper
   ];
 
   mesonFlags= [
@@ -44,7 +36,6 @@ stdenv.mkDerivation rec {
     "-Dtest-junit-xml=false"
     # TODO:
     #"--enable-clients"
-    #"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
   ] ++ lib.optionals (xwayland != null) [
     "-Dxwayland-path=${xwayland.out}/bin/Xwayland"
   ];