pyrox.dev
xwayland: 23.2.6 -> 24.1.0, add a few things, add myself as maintainer
- 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.
+11
-9
pkgs/servers/x11/xorg/xwayland.nix
+11
-9
pkgs/servers/x11/xorg/xwayland.nix
···
4
4
, fetchpatch
5
5
, fontutil
6
6
, lib
7
+
, libdecor
7
8
, libei
8
9
, libGL
9
10
, libGLU
···
33
34
, pkg-config
34
35
, pixman
35
36
, stdenv
37
+
, systemd
36
38
, wayland
37
39
, wayland-protocols
38
40
, wayland-scanner
···
47
49
48
50
stdenv.mkDerivation rec {
49
51
pname = "xwayland";
50
-
version = "23.2.6";
52
+
version = "24.1.0";
51
53
52
54
src = fetchurl {
53
55
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
54
-
hash = "sha256-HJo2a058ytug+b0xPFnq4S0jvXJUOyKibq+LIINc/G0=";
56
+
hash = "sha256-vvIcTxiAek7VccTi32CrY7VGa71QLszrJIW4kqt23MI=";
55
57
};
56
58
57
59
patches = [
58
-
# Backport fix for libei scrolling
59
-
# Notably affects Steam Input, but also anything else using xtest
60
+
# Backport fix for pkg-config generation to make CMake happy
60
61
# FIXME: remove when merged
61
-
# Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1531
62
+
# Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1543
62
63
(fetchpatch {
63
-
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/317712eb5a1aa4a1c3d737a8fcaee57add9981c9.patch";
64
-
hash = "sha256-TZo38Pyr9IJUF+3bqlmF4M84XGgo9G6WFTvbaP9r0XU=";
64
+
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/8cb1c21a4240a5b6bf4aeeef51819639b4e0ad24.patch";
65
+
hash = "sha256-MZPP9QgYO4RFJ/vcjkpu7SVSo5Dh09ZdZjOwTopjdYQ=";
65
66
})
66
67
];
67
68
···
76
77
];
77
78
buildInputs = [
78
79
egl-wayland
80
+
libdecor
79
81
libepoxy
80
82
libei
81
83
fontutil
···
102
104
mesa
103
105
openssl
104
106
pixman
107
+
systemd
105
108
wayland
106
109
wayland-protocols
107
110
xkbcomp
···
112
115
libunwind
113
116
];
114
117
mesonFlags = [
115
-
(lib.mesonBool "xwayland_eglstream" true)
116
118
(lib.mesonBool "xcsecurity" true)
117
119
(lib.mesonOption "default_font_path" defaultFontPath)
118
120
(lib.mesonOption "xkb_bin_dir" "${xkbcomp}/bin")
···
132
134
homepage = "https://wayland.freedesktop.org/xserver.html";
133
135
license = licenses.mit;
134
136
mainProgram = "Xwayland";
135
-
maintainers = with maintainers; [ emantor ];
137
+
maintainers = with maintainers; [ emantor k900 ];
136
138
platforms = platforms.linux;
137
139
};
138
140
}