diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-02-18 09:47:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-18 09:47:12 +0000 |
| commit | 95e7aa789d74454cfa61653004eb194ca37c40bc (patch) | |
| tree | c77b90bd768985a842ea25dc8edd4f09eb8d4cc6 /pkgs/servers | |
| parent | 48c2331991048c74452fbe1f17236d7ab7597a5d (diff) | |
| parent | c73f3cf9276f742f4cd65aee51953553b4732838 (diff) | |
Merge pull request #216194 from Kiskae/patch-4
xwayland: enable libunwind
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/xwayland.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 582ec11231cd8..c76295cec83fb 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -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; { |