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