From fe3ce6fb0560aa1931dc63c258f06b5f42ebd689 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 14 Nov 2021 15:46:04 +0000 Subject: [WIP] weston minimal --- .../window-managers/weston/default.nix | 61 ++++++++++++++-------- 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 043e2b02a7f..deb39708106 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner, python3 -, wayland, libGL, mesa, libxkbcommon, cairo, libxcb -, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, wayland-scanner +, python3, wayland, libGL, mesa, libxkbcommon, cairo, libxcb +, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev, pixman , colord, lcms2, pipewire ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null, wayland-protocols @@ -17,31 +17,50 @@ stdenv.mkDerivation rec { sha256 = "1bj7wnadr7ssn6xw7k8ki0wpj6np3kjd2pcysfz3h0mr290rc8sw"; }; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner python3 ]; + nativeBuildInputs = [ meson ninja pkg-config /* wayland-scanner */ python3 ]; buildInputs = [ - wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm - mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva - libwebp wayland-protocols - colord lcms2 pipewire + wayland /* libGL mesa */ libxkbcommon cairo /* libxcb libXcursor xlibsWrapper udev */ libdrm + /* mtdev libjpeg pam dbus */ libinput libevdev /* pango libunwind freerdp vaapi libva */ pixman + /* libwebp */ wayland-protocols + # colord lcms2 pipewire ]; - mesonFlags= [ - "-Dbackend-drm-screencast-vaapi=${boolToString (vaapi != null)}" - "-Dbackend-rdp=${boolToString (freerdp != null)}" - "-Dxwayland=${boolToString (xwayland != null)}" # Default is true! - "-Dremoting=false" # TODO - "-Dpipewire=${boolToString (pipewire != null)}" - "-Dimage-webp=${boolToString (libwebp != null)}" - "-Ddemo-clients=false" + mesonFlags = [ + "-Dimage-jpeg=false" + "-Dimage-webp=false" + "-Dlauncher-logind=false" + "-Drenderer-gl=false" + "-Dbackend-drm-screencast-vaapi=false" + "-Dbackend-drm=false" + "-Dbackend-default=auto" + "-Dbackend-rdp=false" + "-Dxwayland=false" + "-Dcolor-management-lcms=false" + "-Dcolor-management-colord=false" + "-Dremoting=false" + "-Dpipewire=false" "-Dsimple-clients=" + "-Ddemo-clients=false" "-Dtest-junit-xml=false" - # TODO: - #"--enable-clients" - #"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails - ] ++ optionals (xwayland != null) [ - "-Dxwayland-path=${xwayland.out}/bin/Xwayland" ]; + # mesonFlags= [ + # "-Dbackend-drm-screencast-vaapi=${boolToString (vaapi != null)}" + # "-Dbackend-rdp=${boolToString (freerdp != null)}" + # "-Dxwayland=${boolToString (xwayland != null)}" # Default is true! + # "-Dremoting=false" # TODO + # "-Dpipewire=${boolToString (pipewire != null)}" + # "-Dimage-webp=${boolToString (libwebp != null)}" + # "-Ddemo-clients=false" + # "-Dsimple-clients=" + # "-Dtest-junit-xml=false" + # # TODO: + # #"--enable-clients" + # #"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails + # ] ++ optionals (xwayland != null) [ + # "-Dxwayland-path=${xwayland.out}/bin/Xwayland" + # ]; + passthru.providedSessions = [ "weston" ]; meta = { -- cgit 1.4.1