Merge pull request #172441 from a-m-joseph/pr/zhf/wdomirror

wdomirror: fix build failure by applying patch from GH #5
This commit is contained in:
Rick van Schijndel 2022-05-11 07:12:54 +02:00 committed by GitHub
commit dfca4b7986
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 0 deletions

View file

@ -0,0 +1,15 @@
From https://github.com/progandy/wdomirror/issues/5#issuecomment-1103265438
--- a/main.c
+++ b/main.c
@@ -409,9 +409,12 @@ xdg_toplevel_handle_close(void *data, struct xdg_toplevel *xdg_toplevel)
ctx->quit = true;
}
+static void xdg_toplevel_handle_configure_bounds(void *data, struct xdg_toplevel *toplevel, int32_t width, int32_t height) {}
+
static const struct xdg_toplevel_listener xdg_toplevel_listener = {
xdg_toplevel_handle_configure,
xdg_toplevel_handle_close,
+ xdg_toplevel_handle_configure_bounds,
};

View file

@ -23,6 +23,15 @@ stdenv.mkDerivation {
buildInputs = [ wayland ]; buildInputs = [ wayland ];
patches = [
# A recent change to xdg-shell-client-protocol causes a build
# failure. This was reported upstream as GH #5. User @AlexBMJ
# posted the following two-line fix in that issue, but the
# developer has not yet responded:
# https://github.com/progandy/wdomirror/issues/5#issuecomment-1103265438
./configure-bounds.patch
];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
install -m755 -D wdomirror $out/bin/wdomirror install -m755 -D wdomirror $out/bin/wdomirror