colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

sway: fix wlroots drmSync bug via upstream patch

Browse Source
This commit is contained in:
Colin
2024-08-12 21:52:44 +00:00
parent 7d97355d2a
commit 144afd8171
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
hosts/common/programs/sway/default.nix
View File

@@ -62,6 +62,21 @@ let
substituteInPlace types/wlr_xdg_activation_v1.c \
--replace-fail 'if (token->seat != NULL)' 'if (false && token->seat != NULL)'
'';
patches = (upstream.patches or []) ++ [
(pkgs.fetchpatch {
# XXX(2024-08-12): drmSyncobj causes sway to fail to create any output at launch:
# sway: 00:00:09.955 [ERROR] [wlr] [render/drm_syncobj.c:24] drmSyncobjCreate failed: Operation not supported
# sway: 00:00:09.955 [ERROR] [sway/desktop/output.c:545] Failed to create a scene output
# this is fixable in wlroots -- not via sway.
# - sway patch (reverting it does *not* fix): <https://github.com/swaywm/sway/pull/8156>
# - wlroot patch which introduced the bug: <https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4715>
# see (tracking): <https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4715#note_2523517>
# - <https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4781>
name = "render-gles2-check-for-DRM_CAP_SYNCOBJ_TIMELINE";
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4781.patch";
hash = "sha256-Z6m49DZutyTB54z4AGmjTUoE0EbF4tJ1GyOXC+gqQgU=";
})
];
});
swayPackage = wrapSway (
(pkgs.nixpkgs-wayland.sway-unwrapped.override {
@@ -256,14 +271,6 @@ in
# docs: <https://discourse.ubuntu.com/t/environment-variables-for-wayland-hackers/12750>
# N.B.: gtk apps support absolute paths for this; webkit apps (e.g. geary) support only relative paths (relative to $XDG_RUNTIME_DIR)
env.WAYLAND_DISPLAY = "wl/wayland-1";
# XXX(2024-08-12): drmSyncobj causes sway to fail to create any output at launch:
# sway: 00:00:09.955 [ERROR] [wlr] [render/drm_syncobj.c:24] drmSyncobjCreate failed: Operation not supported
# sway: 00:00:09.955 [ERROR] [sway/desktop/output.c:545] Failed to create a scene output
# this is fixable in wlroots -- not via sway.
# - sway patch (reverting it does *not* fix): <https://github.com/swaywm/sway/pull/8156>
# - wlroot patch which introduced the bug: <https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4715>
# see (tracking): <https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4715#note_2523517>
env.WLR_RENDER_NO_EXPLICIT_SYNC = "1";
services.private-storage.dependencyOf = [ "sway" ]; #< HACK: prevent unl0kr and sway from fighting over the tty
services.sway = {