colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xwayland: 23.2.6 -> 24.1.0, add a few things, add myself as maintainer

Browse Source 
- libsystemd used for starting via sd-notify, is already in the closure via libei
- libdecor used for window decorations on rootful
- eglstream backend is gone

Includes patch from #311886.
This commit is contained in:
K900 2024-05-15 17:45:37 +03:00
parent 9997402000
commit d8f09e31a9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/servers/x11/xorg/xwayland.nix
View File

@ -4,6 +4,7 @@
, fetchpatch
, fontutil
, lib
, libdecor
, libei
, libGL
, libGLU
@ -33,6 +34,7 @@
, pkg-config
, pixman
, stdenv
, systemd
, wayland
, wayland-protocols
, wayland-scanner
@ -47,21 +49,20 @@
stdenv.mkDerivation rec {
pname = "xwayland";
version = "23.2.6";
version = "24.1.0";
src = fetchurl {
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
hash = "sha256-HJo2a058ytug+b0xPFnq4S0jvXJUOyKibq+LIINc/G0=";
hash = "sha256-vvIcTxiAek7VccTi32CrY7VGa71QLszrJIW4kqt23MI=";
};
patches = [
# Backport fix for libei scrolling
# Notably affects Steam Input, but also anything else using xtest
# Backport fix for pkg-config generation to make CMake happy
# FIXME: remove when merged
# Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1531
# Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1543
(fetchpatch {
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/317712eb5a1aa4a1c3d737a8fcaee57add9981c9.patch";
hash = "sha256-TZo38Pyr9IJUF+3bqlmF4M84XGgo9G6WFTvbaP9r0XU=";
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/8cb1c21a4240a5b6bf4aeeef51819639b4e0ad24.patch";
hash = "sha256-MZPP9QgYO4RFJ/vcjkpu7SVSo5Dh09ZdZjOwTopjdYQ=";
})
];
@ -76,6 +77,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
egl-wayland
libdecor
libepoxy
libei
fontutil
@ -102,6 +104,7 @@ stdenv.mkDerivation rec {
mesa
openssl
pixman
systemd
wayland
wayland-protocols
xkbcomp
@ -112,7 +115,6 @@ stdenv.mkDerivation rec {
libunwind
];
mesonFlags = [
(lib.mesonBool "xwayland_eglstream" true)
(lib.mesonBool "xcsecurity" true)
(lib.mesonOption "default_font_path" defaultFontPath)
(lib.mesonOption "xkb_bin_dir" "${xkbcomp}/bin")
@ -132,7 +134,7 @@ stdenv.mkDerivation rec {
homepage = "https://wayland.freedesktop.org/xserver.html";
license = licenses.mit;
mainProgram = "Xwayland";
maintainers = with maintainers; [ emantor ];
maintainers = with maintainers; [ emantor k900 ];
platforms = platforms.linux;
};
}