diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2024-03-18 17:48:56 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-03-18 23:19:59 +0000 |
| commit | fbf5e26b5c0b96828c3b34be7be6bceac1819a23 (patch) | |
| tree | b78579eda83f4b76cc5c9a1e20ed18d13fcf2f68 /hw/xwayland | |
| parent | 66b371f3064cdfc549422d45bcd49a175368adfa (diff) | |
xwayland: Use full path for Xwayland exec
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1421>
Diffstat (limited to 'hw/xwayland')
| -rw-r--r-- | hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in (renamed from hw/xwayland/desktop/org.freedesktop.Xwayland.desktop) | 2 | ||||
| -rw-r--r-- | hw/xwayland/meson.build | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop b/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in index 32c3e78b2..6a9d9fc4b 100644 --- a/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop +++ b/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in @@ -4,5 +4,5 @@ Comment=A rootful instance of the Xwayland X11 server Terminal=false Type=Application Categories=System; -Exec=Xwayland -displayfd 1 +Exec=@XWAYLAND@ -displayfd 1 NoDisplay=true diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build index 4d878dae8..3bb7f88c0 100644 --- a/hw/xwayland/meson.build +++ b/hw/xwayland/meson.build @@ -195,9 +195,16 @@ xwayland_manpage = configure_file( ) install_man(xwayland_manpage) +desktop_data = configuration_data() +desktop_data.set('XWAYLAND', xwayland_server.full_path()) +desktop_file = configure_file( + input: 'desktop/org.freedesktop.Xwayland.desktop.in', + output: 'org.freedesktop.Xwayland.desktop', + configuration: desktop_data, +) datadir = join_paths(get_option('prefix'), get_option('datadir')) desktopdir = join_paths(datadir, 'applications') -install_data('desktop/org.freedesktop.Xwayland.desktop', install_dir : desktopdir) +install_data(desktop_file, install_dir : desktopdir) meson.override_find_program('Xwayland', xwayland_server) meson.override_dependency('xwayland', declare_dependency( |