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

wdomirror: avoid adding a patch
main
Artturi 2 years ago committed by GitHub
commit d009231c3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      pkgs/tools/wayland/wdomirror/configure-bounds.patch
  2. 12
      pkgs/tools/wayland/wdomirror/default.nix

@ -1,15 +0,0 @@
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,
};

@ -6,6 +6,7 @@
, pkg-config
, wayland
, wayland-protocols
, fetchurl
}:
stdenv.mkDerivation {
@ -24,12 +25,11 @@ 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
# https://github.com/progandy/wdomirror/pull/7
(fetchurl {
url = "https://github.com/progandy/wdomirror/commit/142632208e9ea2b4a4ebd784532efdb8cad7b87c.patch";
hash = "sha256-z6/8q2vOtmlGFbDVG5BVWWbLQT8kBvJXT9/oZkWS9gw=";
})
];
installPhase = ''

Loading…
Cancel
Save