pyrox.dev
Merge pull request #115552 from Emantor/topic/xwayland_bump
xwayland: 1.20.10 -> 21.1.1
authored by
Martin Weinelt
and committed by
GitHub
8b3e8d91
f75eb3d9
+90
-30
pkgs/servers/x11/xorg/xwayland.nix
+90
-30
pkgs/servers/x11/xorg/xwayland.nix
···
1
-
{ lib, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config
2
-
, epoxy, libxslt, libunwind, makeWrapper, egl-wayland
1
+
{ egl-wayland
2
+
, epoxy
3
+
, fetchurl
4
+
, fontutil
5
+
, lib
6
+
, libGL
7
+
, libGLU
8
+
, libX11
9
+
, libXau
10
+
, libXaw
11
+
, libXdmcp
12
+
, libXext
13
+
, libXfixes
14
+
, libXfont2
15
+
, libXmu
16
+
, libXpm
17
+
, libXrender
18
+
, libXres
19
+
, libXt
20
+
, libdrm
21
+
, libtirpc
22
+
, libunwind
23
+
, libxcb
24
+
, libxkbfile
25
+
, libxshmfence
26
+
, mesa
27
+
, meson
28
+
, ninja
29
+
, openssl
30
+
, pkg-config
31
+
, pixman
32
+
, stdenv
33
+
, wayland
34
+
, wayland-protocols
35
+
, xkbcomp
36
+
, xkeyboard_config
37
+
, xorgproto
38
+
, xtrans
39
+
, zlib
3
40
, defaultFontPath ? "" }:
4
41
5
-
with lib;
6
-
7
-
xorgserver.overrideAttrs (oldAttrs: {
42
+
stdenv.mkDerivation rec {
8
43
9
-
name = "xwayland-${xorgserver.version}";
10
-
buildInputs = oldAttrs.buildInputs ++ [ egl-wayland ];
11
-
propagatedBuildInputs = oldAttrs.propagatedBuildInputs
12
-
++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind];
13
-
configureFlags = [
14
-
"--disable-docs"
15
-
"--disable-devel-docs"
16
-
"--enable-xwayland"
17
-
"--enable-xwayland-eglstream"
18
-
"--disable-xorg"
19
-
"--disable-xvfb"
20
-
"--disable-xnest"
21
-
"--disable-xquartz"
22
-
"--disable-xwin"
23
-
"--enable-glamor"
24
-
"--with-default-font-path=${defaultFontPath}"
25
-
"--with-xkb-bin-directory=${xkbcomp}/bin"
26
-
"--with-xkb-path=${xkeyboard_config}/etc/X11/xkb"
27
-
"--with-xkb-output=$(out)/share/X11/xkb/compiled"
44
+
pname = "xwayland";
45
+
version = "21.1.1";
46
+
src = fetchurl {
47
+
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
48
+
sha256 = "sha256-MfJhzlG77namyj7AKqNn/6K176K5hBLfV8zv16GQA84=";
49
+
};
50
+
nativeBuildInputs = [ pkg-config meson ninja ];
51
+
buildInputs = [
52
+
egl-wayland
53
+
epoxy
54
+
fontutil
55
+
libGL
56
+
libGLU
57
+
libX11
58
+
libXau
59
+
libXaw
60
+
libXdmcp
61
+
libXext
62
+
libXfixes
63
+
libXfont2
64
+
libXmu
65
+
libXpm
66
+
libXrender
67
+
libXres
68
+
libXt
69
+
libdrm
70
+
libtirpc
71
+
libunwind
72
+
libxcb
73
+
libxkbfile
74
+
libxshmfence
75
+
mesa
76
+
openssl
77
+
pixman
78
+
wayland
79
+
wayland-protocols
80
+
xkbcomp
81
+
xorgproto
82
+
xtrans
83
+
zlib
28
84
];
29
-
30
-
postInstall = ''
31
-
rm -fr $out/share/X11/xkb/compiled
32
-
'';
85
+
mesonFlags = [
86
+
"-Dxwayland-eglstream=true"
87
+
"-Ddefault-font-path=${defaultFontPath}"
88
+
"-Dxkb_bin_dir=${xkbcomp}/bin"
89
+
"-Dxkb_dir=${xkeyboard_config}/etc/X11/xkb"
90
+
"-Dxkb_output_dir=${placeholder "out"}/share/X11/xkb/compiled"
91
+
];
33
92
34
-
meta = {
93
+
meta = with lib; {
35
94
description = "An X server for interfacing X11 apps with the Wayland protocol";
36
95
homepage = "https://wayland.freedesktop.org/xserver.html";
37
96
license = licenses.mit;
97
+
maintainers = with maintainers; [ emantor ];
38
98
platforms = platforms.linux;
39
99
};
40
-
})
100
+
}