ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-24 14:18:13 +03:00
Code Issues Projects Releases Wiki Activity

xwayland: added withLibunwind to guard libunwind dependency

Browse Source
This commit is contained in:
Sergei Trofimovich 2023-09-22 18:10:25 +01:00 committed by Anderson Torres
parent 0966f1d593
commit de359db4b9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@
, libXt
, libdrm
, libtirpc
, libunwind
, withLibunwind ? true, libunwind
, libxcb
, libxkbfile
, libxshmfence
@ -81,7 +81,6 @@ stdenv.mkDerivation rec {
libXt
libdrm
libtirpc
libunwind
libxcb
libxkbfile
libxshmfence
@ -95,6 +94,8 @@ stdenv.mkDerivation rec {
xorgproto
xtrans
zlib
] ++ lib.optionals withLibunwind [
libunwind
];
mesonFlags = [
(lib.mesonBool "xwayland_eglstream" true)
@ -103,7 +104,7 @@ stdenv.mkDerivation rec {
(lib.mesonOption "xkb_bin_dir" "${xkbcomp}/bin")
(lib.mesonOption "xkb_dir" "${xkeyboard_config}/etc/X11/xkb")
(lib.mesonOption "xkb_output_dir" "${placeholder "out"}/share/X11/xkb/compiled")
(lib.mesonBool "libunwind" (libunwind != null))
(lib.mesonBool "libunwind" withLibunwind)
];
passthru.updateScript = gitUpdater {