diff options
| author | Jan Beich <[email protected]> | 2023-07-18 10:13:59 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-07-18 12:13:59 +0200 |
| commit | 8c9e2e1ff1d22f7954f5e75194e9f77cacffa3f6 (patch) | |
| tree | a679f4543da17d5d41f5da665c16679f80caddee /nix | |
| parent | 5c8a20be77dab288171ef4d63c3993e4bf4f0eef (diff) | |
| download | Hyprland-8c9e2e1ff1d22f7954f5e75194e9f77cacffa3f6.tar.gz Hyprland-8c9e2e1ff1d22f7954f5e75194e9f77cacffa3f6.zip | |
deps: update wlroots (#2734)
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/wlroots-nvidia.patch | 28 | ||||
| -rw-r--r-- | nix/wlroots.nix | 5 |
2 files changed, 29 insertions, 4 deletions
diff --git a/nix/wlroots-nvidia.patch b/nix/wlroots-nvidia.patch new file mode 100644 index 00000000..130eb041 --- /dev/null +++ b/nix/wlroots-nvidia.patch @@ -0,0 +1,28 @@ +diff --git a/types/output/render.c b/types/output/render.c +index 2e38919a..97f78608 100644 +--- a/types/output/render.c ++++ b/types/output/render.c +@@ -240,22 +240,7 @@ bool output_pick_format(struct wlr_output *output, + } + + uint32_t wlr_output_preferred_read_format(struct wlr_output *output) { +- struct wlr_renderer *renderer = output->renderer; +- assert(renderer != NULL); +- +- if (!renderer->impl->preferred_read_format || !renderer->impl->read_pixels) { +- return DRM_FORMAT_INVALID; +- } +- +- if (!wlr_output_attach_render(output, NULL)) { +- return false; +- } +- +- uint32_t fmt = renderer->impl->preferred_read_format(renderer); +- +- output_clear_back_buffer(output); +- +- return fmt; ++ return DRM_FORMAT_XRGB8888; + } + + struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output, diff --git a/nix/wlroots.nix b/nix/wlroots.nix index 7b05d9ff..2b93da9d 100644 --- a/nix/wlroots.nix +++ b/nix/wlroots.nix @@ -44,10 +44,7 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) '' }) ]) ++ (lib.optionals nvidiaPatches [ - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-nvidia-format-workaround.patch?h=hyprland-nvidia-screenshare-git"; - sha256 = "A9f1p5EW++mGCaNq8w7ZJfeWmvTfUm4iO+1KDcnqYX8="; - }) + ./wlroots-nvidia.patch ]); postPatch = (old.postPatch or "") |