ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 20:49:52 +03:00
Code Issues Projects Releases Wiki Activity

weston: remove unused dependencies

Browse Source 
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.
This commit is contained in:
Alyssa Ross 2023-05-25 10:56:43 +00:00
parent ef39dca2f2
commit f333927497
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/window-managers/weston/default.nix
View File

@ -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)

3
pkgs/top-level/all-packages.nix
View File

@ -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;