diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-09-22 18:10:25 +0100 |
|---|---|---|
| committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-09-23 16:43:51 -0300 |
| commit | de359db4b9495ce801604b2e4c00d8f85744791e (patch) | |
| tree | 4401300f064f36eef978ea5eb2a3b2d2a46c6722 /pkgs/servers/x11 | |
| parent | 0966f1d593d6371127086bcd735499c6b4e16f5a (diff) | |
| download | nixlib-de359db4b9495ce801604b2e4c00d8f85744791e.tar nixlib-de359db4b9495ce801604b2e4c00d8f85744791e.tar.gz nixlib-de359db4b9495ce801604b2e4c00d8f85744791e.tar.bz2 nixlib-de359db4b9495ce801604b2e4c00d8f85744791e.tar.lz nixlib-de359db4b9495ce801604b2e4c00d8f85744791e.tar.xz nixlib-de359db4b9495ce801604b2e4c00d8f85744791e.tar.zst nixlib-de359db4b9495ce801604b2e4c00d8f85744791e.zip | |
xwayland: added `withLibunwind` to guard `libunwind` dependency
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/xwayland.nix | 7 |
1 files 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 { |