Commit de359db4 authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by Anderson Torres
Browse files

xwayland: added `withLibunwind` to guard `libunwind` dependency

parent 0966f1d5

pkgs/servers/x11/xorg/xwayland.nix

+4 −3
Original line number Diff line number Diff line
@@ -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 {