frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Olivier Fourdan 2024-03-18 17:48:56 +01:00 committed by Marge Bot
parent 66b371f306
commit fbf5e26b5c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwayland/desktop/org.freedesktop.Xwayland.desktop → hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
View File

@ -4,5 +4,5 @@ Comment=A rootful instance of the Xwayland X11 server
Terminal=false Terminal=false
Type=Application Type=Application
Categories=System; Categories=System;
Exec=Xwayland -displayfd 1 Exec=@XWAYLAND@ -displayfd 1
NoDisplay=true NoDisplay=true

9
hw/xwayland/meson.build
View File

@ -195,9 +195,16 @@ xwayland_manpage = configure_file(
) )
install_man(xwayland_manpage) 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')) datadir = join_paths(get_option('prefix'), get_option('datadir'))
desktopdir = join_paths(datadir, 'applications') 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_find_program('Xwayland', xwayland_server)
meson.override_dependency('xwayland', declare_dependency( meson.override_dependency('xwayland', declare_dependency(