Skip to content

Commit

Permalink
Merge pull request #172441 from a-m-joseph/pr/zhf/wdomirror
Browse files Browse the repository at this point in the history
wdomirror: fix build failure by applying patch from GH #5
  • Loading branch information
Mindavi authored May 11, 2022
2 parents 78520c1 + de559a3 commit dfca4b7
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
15 changes: 15 additions & 0 deletions pkgs/tools/wayland/wdomirror/configure-bounds.patch
Original file line number Diff line number Diff line change
@@ -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,
};
9 changes: 9 additions & 0 deletions pkgs/tools/wayland/wdomirror/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ stdenv.mkDerivation {

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 = ''
runHook preInstall
install -m755 -D wdomirror $out/bin/wdomirror
Expand Down

0 comments on commit dfca4b7

Please sign in to comment.