From df2c09914296709f8f8fe15e99291d302ebdda6b Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Wed, 16 Feb 2022 15:06:06 +0100 Subject: [PATCH] wayland: allow absolute path in WAYLAND_DISPLAY If WAYLAND_DISPLAY starts with a '/', use it for the socket path as-is. See [1]. [1]: https://gitlab.freedesktop.org/wayland/wayland/-/blob/d690712b7b83faeb8fca4015b296aece2fb30c65/src/wayland-client.c#L1064-1095 Signed-off-by: Julian Orth (cherry picked from commit aac1205d66e03facc965279d5825272597b305d0) --- common/flatpak-run.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/flatpak-run.c b/common/flatpak-run.c index 28ad57093..141a1cd3d 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c @@ -308,7 +308,10 @@ flatpak_run_add_wayland_args (FlatpakBwrap *bwrap) if (!wayland_display) wayland_display = "wayland-0"; - wayland_socket = g_build_filename (user_runtime_dir, wayland_display, NULL); + if (wayland_display[0] == '/') + wayland_socket = g_strdup (wayland_display); + else + wayland_socket = g_build_filename (user_runtime_dir, wayland_display, NULL); if (!g_str_has_prefix (wayland_display, "wayland-") || strchr (wayland_display, '/') != NULL)