From f333927497274800b76f5c016a89bc51b33893f5 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 25 May 2023 10:56:43 +0000
Subject: weston: remove unused dependencies

colord support is deprecated and disabled by default.
libGL is redundant with Mesa.
libXcursor is only required when Xwayland is enabled.
libunwind and mtdev is unused since Weston 4.
libxcb and udev are propagated.
pam is unused since Weston 11.

There's no "vaapi" package at all, and there never has been.  This
presumably meant to refer to libva.  This is a very good demonstration
of the problem with the "? null" pattern for optional dependencies!
As a result, VA-API support had been unintentionally disabled by
default this whole time.
---
 pkgs/applications/window-managers/weston/default.nix | 16 +++++++---------
 pkgs/top-level/all-packages.nix                      |  3 +--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 13dd27e93865c..84ef3b8d33808 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,10 +1,9 @@
 { lib, stdenv, fetchurl
 , meson, ninja, pkg-config, python3, wayland-scanner
-, cairo, colord, dbus, lcms2, libGL, libXcursor, libdrm, libevdev, libinput
-, libjpeg, seatd, libxcb, libxkbcommon, mesa, mtdev, pam, udev, wayland
-, wayland-protocols
-, pipewire ? null, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null
-, libva ? null, libwebp ? null, xwayland ? null
+, cairo, dbus, lcms2, libdrm, libevdev, libinput, libjpeg, seatd, libxkbcommon
+, mesa, wayland, wayland-protocols
+, pipewire ? null, pango ? null, freerdp ? null
+, libXcursor ? null, libva ? null, libwebp ? null, xwayland ? null
 # beware of null defaults, as the parameters *are* supplied by callPackage by default
 , buildDemo ? true
 , buildRemoting ? true, gst_all_1
@@ -22,16 +21,15 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ pkg-config ];
   nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ];
   buildInputs = [
-    cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput
-    libjpeg seatd libunwind libva libwebp libxcb libxkbcommon mesa mtdev pam
-    pango pipewire udev vaapi wayland wayland-protocols
+    cairo dbus freerdp lcms2 libXcursor libdrm libevdev libinput libjpeg seatd
+    libva libwebp libxkbcommon mesa pango pipewire wayland wayland-protocols
   ] ++ lib.optionals buildRemoting [
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
   ];
 
   mesonFlags= [
-    "-Dbackend-drm-screencast-vaapi=${lib.boolToString (vaapi != null)}"
+    "-Dbackend-drm-screencast-vaapi=${lib.boolToString (libva != null)}"
     "-Dbackend-rdp=${lib.boolToString (freerdp != null)}"
     "-Dxwayland=${lib.boolToString (xwayland != null)}" # Default is true!
     (lib.mesonBool "remoting" buildRemoting)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7518848ccc98..d694d05d42b62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35212,8 +35212,7 @@ with pkgs;
   westonLite = weston.override {
     pango = null;
     freerdp = null;
-    libunwind = null;
-    vaapi = null;
+    libXcursor = null;
     libva = null;
     libwebp = null;
     xwayland = null;
-- 
cgit 1.4.1