From de359db4b9495ce801604b2e4c00d8f85744791e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 22 Sep 2023 18:10:25 +0100 Subject: [PATCH] xwayland: added `withLibunwind` to guard `libunwind` dependency --- pkgs/servers/x11/xorg/xwayland.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 9dc2adcad9b6..7ad83147fa16 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -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 {