From f35d9453f7a0eee735418c2fabcf0f73130a98a4 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 11 May 2022 01:30:53 -0700 Subject: [PATCH] wdomirror: avoid adding a patch A few hours after my previous PR #172441 was merged, one of the upstream contributors responded to my comment that their PR did not adequately address this issue: https://github.com/progandy/wdomirror/pull/7 The PR has not yet merged, but at least now we can reference this commit instead of having a patch in nixpkgs. --- .../wayland/wdomirror/configure-bounds.patch | 15 --------------- pkgs/tools/wayland/wdomirror/default.nix | 12 ++++++------ 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 pkgs/tools/wayland/wdomirror/configure-bounds.patch diff --git a/pkgs/tools/wayland/wdomirror/configure-bounds.patch b/pkgs/tools/wayland/wdomirror/configure-bounds.patch deleted file mode 100644 index c42563741df..00000000000 --- a/pkgs/tools/wayland/wdomirror/configure-bounds.patch +++ /dev/null @@ -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, - }; diff --git a/pkgs/tools/wayland/wdomirror/default.nix b/pkgs/tools/wayland/wdomirror/default.nix index 67d8a7cf299..5c3b7ddbb72 100644 --- a/pkgs/tools/wayland/wdomirror/default.nix +++ b/pkgs/tools/wayland/wdomirror/default.nix @@ -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 = ''