diff options
| author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-10-08 10:14:51 -0600 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-10-08 10:14:51 -0600 |
| commit | 2f0e87732c21a724de9523b0f92b36cd6613ff26 (patch) | |
| tree | 6073f22ebf989648903d9cea063009502ccd42bf /pkgs/applications/window-managers | |
| parent | 0b4a97a07f72bcf265034e5e2d95d6fa02e694a7 (diff) | |
| parent | 0b39eeda969696c28c5c858196b52661db51f9e4 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/weston/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index e28c26c528742..467396a6d8ae8 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch2 , meson, ninja, pkg-config, python3, wayland-scanner -, cairo, dbus, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland +, cairo, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland , wayland-protocols, xcbutilcursor , demoSupport ? true @@ -26,6 +26,16 @@ stdenv.mkDerivation rec { hash = "sha256-62hqfPAJkqI7F/GS/KmohzE+ksNG7jXYV1GWmD1la0o="; }; + patches = [ + # ci, backend-vnc: update to Neat VNC 0.7.0 + # part of https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1051 + (fetchpatch2 { + url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/8895b15f3dfc555a869e310ff6e16ff5dced1336.patch"; + hash = "sha256-PGAmQhzG8gZcYRaZwhKPlgzfbILIXGAHLSd9dCHAP1A="; + excludes = [ ".gitlab-ci.yml" ]; + }) + ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ |