blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwayland: actually use Xwayland from pkg-config 

eec2e1d3b1 introduced logic to use the Xwayland
binary discovered via pkg-config.
While the newly introduced checks correctly used the binary from pkg-config,
the actual execution still used the previous PATH-search logic.
This commit is contained in:
Thomas Weißschuh 2021-05-12 10:09:40 +02:00 committed by Simon Ser
parent 101b9a193d
commit 9f211b5dd4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xwayland/server.c
View File

@ -119,13 +119,13 @@ noreturn static void exec_xwayland(struct wlr_xwayland_server *server) {
wlr_log(WLR_INFO, "Using Xwayland binary '%s' due to WLR_XWAYLAND", wlr_log(WLR_INFO, "Using Xwayland binary '%s' due to WLR_XWAYLAND",
xwayland_path); xwayland_path);
} else { } else {
xwayland_path = "Xwayland"; xwayland_path = XWAYLAND_PATH;
} }
// This returns if and only if the call fails // This returns if and only if the call fails
execvp(xwayland_path, argv); execvp(xwayland_path, argv);
wlr_log_errno(WLR_ERROR, "failed to exec Xwayland"); wlr_log_errno(WLR_ERROR, "failed to exec %s", xwayland_path);
close(devnull); close(devnull);
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} }