Unverified Commit 95e7aa78 authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by GitHub
Browse files

Merge pull request #216194 from Kiskae/patch-4

xwayland: enable libunwind
parents 48c23319 c73f3cf9
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -95,11 +95,12 @@ stdenv.mkDerivation rec {
    zlib
  ];
  mesonFlags = [
    "-Dxwayland_eglstream=true"
    "-Ddefault_font_path=${defaultFontPath}"
    "-Dxkb_bin_dir=${xkbcomp}/bin"
    "-Dxkb_dir=${xkeyboard_config}/etc/X11/xkb"
    "-Dxkb_output_dir=${placeholder "out"}/share/X11/xkb/compiled"
    (lib.mesonBool "xwayland_eglstream" true)
    (lib.mesonOption "default_font_path" defaultFontPath)
    (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))
  ];

  meta = with lib; {