summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Fourdan <ofourdan@redhat.com>2024-04-17 15:13:06 +0200
committerOlivier Fourdan <ofourdan@redhat.com>2024-04-18 14:00:03 +0200
commit4725674a23ccb963c3186a81fb1c366290f869ca (patch)
tree1141f1a328576a3eaeeb55d90c61c8cf0c7e017d
parent9f4d612e7e0e75b14e77c9ba7d5429d7809f4bd7 (diff)
xwayland: Use the path to Xwayland as installed
Otherwise the executable cannot be found where specified. v2: Use 'xwayland_path' (Simon) Fixes: fbf5e26b5 - xwayland: Use full path for Xwayland exec Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> (cherry picked from commit 8ff88ffec9fc3d842b54f6a90cffda752cab3e40) Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1494>
-rw-r--r--hw/xwayland/meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index 0097ca8b2..59b2d2793 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -203,7 +203,7 @@ xwayland_manpage = configure_file(
install_man(xwayland_manpage)
desktop_data = configuration_data()
-desktop_data.set('XWAYLAND', xwayland_server.full_path())
+desktop_data.set('XWAYLAND', xwayland_path + '/Xwayland')
desktop_data.set('DECORATE', have_libdecor ? '-decorate' : '')
desktop_file = configure_file(
input: 'desktop/org.freedesktop.Xwayland.desktop.in',