From 7d687638c5e0b09632fd70ba466ab1e544228436 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 23 Aug 2024 07:08:21 +0100
Subject: [PATCH] aquamarine: drop upstreamed patch

Without the change build fails on `staging` as:

       > applying patch /nix/store/k9x1wxd1rs8jada4lwjll841n54hd46h-CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch
       > patching file CMakeLists.txt
       > Reversed (or previously applied) patch detected!  Assume -R? [n]
       > Apply anyway? [n]
       > Skipping patch.
       > 2 out of 2 hunks ignored -- saving rejects to file CMakeLists.txt.rej
---
 ...nd.xml-is-in-wayland-scanner-pkgdata.patch | 37 -------------------
 pkgs/by-name/aq/aquamarine/package.nix        |  3 --
 2 files changed, 40 deletions(-)
 delete mode 100644 pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch

diff --git a/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch b/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch
deleted file mode 100644
index dbce9fe936f1..000000000000
--- a/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 735130758ee6fca74115ca4ec89c6d0dd26777eb Mon Sep 17 00:00:00 2001
-From: Florian Klink <flokli@flokli.de>
-Date: Mon, 19 Aug 2024 14:17:37 +0300
-Subject: [PATCH] CMakeLists: wayland.xml is in wayland-scanner pkgdatadir
-
-See https://gitlab.freedesktop.org/wayland/wayland/-/blob/6c4a695045155583a99f3fbce7bb745f79c2e726/meson.build#L129-136
----
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fc4db31..a61e375 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,8 +71,8 @@ endif()
- # Protocols
- pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
- message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}")
--pkg_get_variable(WAYLAND_CLIENT_DIR wayland-client pkgdatadir)
--message(STATUS "Found wayland-client at ${WAYLAND_CLIENT_DIR}")
-+pkg_get_variable(WAYLAND_SCANNER_PKGDATA_DIR wayland-scanner pkgdatadir)
-+message(STATUS "Found wayland-scanner pkgdatadir at ${WAYLAND_SCANNER_PKGDATA_DIR}")
- 
- function(protocolNew protoPath protoName external)
-   if(external)
-@@ -94,7 +94,7 @@ function(protocolWayland)
-     OUTPUT ${CMAKE_SOURCE_DIR}/protocols/wayland.cpp
-            ${CMAKE_SOURCE_DIR}/protocols/wayland.hpp
-     COMMAND hyprwayland-scanner --wayland-enums --client
--            ${WAYLAND_CLIENT_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/
-+            ${WAYLAND_SCANNER_PKGDATA_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/
-     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-   target_sources(aquamarine PRIVATE protocols/wayland.cpp protocols/wayland.hpp)
- endfunction()
--- 
-2.45.2
-
diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix
index 76bb6a56b81c..0bc91bde511b 100644
--- a/pkgs/by-name/aq/aquamarine/package.nix
+++ b/pkgs/by-name/aq/aquamarine/package.nix
@@ -32,9 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-zushuLkBblDZGVo2qbiMTJ51LSkqYJpje/R2dvfec1U=";
   };
 
-  # https://github.com/hyprwm/aquamarine/pull/55
-  patches = [ ./CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch ];
-
   nativeBuildInputs = [
     cmake
     hyprwayland-scanner