xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use

When debugging Xwayland-related issues, a common first step in debugging
has been to ask the reporter to move their real Xwayland to
/usr/bin/Xwayland.bin, and create a shell script starting Xwayland with
extra arguments under the original /usr/bin/Xwayland location.

Introducing a `WLR_XWAYLAND` environment variable makes this less
invasive, by allowing the user to swap out Xwayland without resorting to
global system changes (or source patches).

1 files changed, 9 insertions, 1 deletions

diff --git a/xwayland/server.c b/xwayland/server.c
index 27e9861a..24b435aa 100644
--- a/xwayland/server.c
+++ b/xwayland/server.c
@@ -107,8 +107,16 @@ noreturn static void exec_xwayland(struct wlr_xwayland_server *server) {
 		dup2(devnull, STDERR_FILENO);
 	}
 
+	const char *xwayland_path = getenv("WLR_XWAYLAND");
+	if (xwayland_path) {
+		wlr_log(WLR_INFO, "Using Xwayland binary to '%s' due to WLR_XWAYLAND",
+			xwayland_path);
+	} else {
+		xwayland_path = "Xwayland";
+	}
+
 	// This returns if and only if the call fails
-	execvp("Xwayland", argv);
+	execvp(xwayland_path, argv);
 
 	wlr_log_errno(WLR_ERROR, "failed to exec Xwayland");
 	close(devnull);