diff options
| author | K900 <me@0upti.me> | 2024-05-12 09:46:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-12 09:46:03 +0300 |
| commit | 861f29655c591aadd16396c0ac67316861d954cc (patch) | |
| tree | 26dee58b652fbd4d12b0a34d4a899c26319c138a | |
| parent | 711b534c415ee437a41cd1d359233913bda47508 (diff) | |
| parent | 5e1e7eb612cb315cceab1186811b70fd51697b89 (diff) | |
Merge pull request #310784 from K900/xwayland-libei-scroll
xwayland: cherry-pick patch to fix scrolling with libei
| -rw-r--r-- | pkgs/servers/x11/xorg/xwayland.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index a34e1285e3071..66a71c1fa3be6 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,6 +1,7 @@ { egl-wayland , libepoxy , fetchurl +, fetchpatch , fontutil , lib , libei @@ -53,6 +54,17 @@ stdenv.mkDerivation rec { hash = "sha256-HJo2a058ytug+b0xPFnq4S0jvXJUOyKibq+LIINc/G0="; }; + patches = [ + # Backport fix for libei scrolling + # Notably affects Steam Input, but also anything else using xtest + # FIXME: remove when merged + # Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1531 + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/317712eb5a1aa4a1c3d737a8fcaee57add9981c9.patch"; + hash = "sha256-TZo38Pyr9IJUF+3bqlmF4M84XGgo9G6WFTvbaP9r0XU="; + }) + ]; + depsBuildBuild = [ pkg-config ]; |