From 48d9153f3ba7b2b89b2066da28b9265883b2f366 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Oct 2024 02:12:33 +0000
Subject: [PATCH] grandorgue: 3.15.1-1 -> 3.15.2-1

---
 .../audio/grandorgue/darwin-fixes.patch             | 13 +++++++++++++
 pkgs/applications/audio/grandorgue/default.nix      | 11 +++--------
 2 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/applications/audio/grandorgue/darwin-fixes.patch

diff --git a/pkgs/applications/audio/grandorgue/darwin-fixes.patch b/pkgs/applications/audio/grandorgue/darwin-fixes.patch
new file mode 100644
index 000000000000..f38a1dded2ec
--- /dev/null
+++ b/pkgs/applications/audio/grandorgue/darwin-fixes.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
+index d231e3d1..73f389a2 100644
+--- a/resources/CMakeLists.txt
++++ b/resources/CMakeLists.txt
+@@ -62,7 +62,7 @@ if(WIN32)
+ 		     DEPENDS "${CMAKE_SOURCE_DIR}/resources/GrandOrgue.manifest")
+   LIST(APPEND DEPLIST "${RESOURCEDIR}/GOIcon.ico" "${RESOURCEDIR}/GrandOrgue.rc" "${RESOURCEDIR}/GrandOrgue.manifest")
+ elseif(APPLE)
+-   ADD_CUSTOM_COMMAND(OUTPUT "${RESOURCEDIR}/GrandOrgue.icns" COMMAND iconutil -c icns --output "${RESOURCEDIR}/GrandOrgue.icns" ${GENERATED_ICONS_DIR} DEPENDS ${GENERATED_ICONS})
++   ADD_CUSTOM_COMMAND(OUTPUT "${RESOURCEDIR}/GrandOrgue.icns" COMMAND png2icns "${RESOURCEDIR}/GrandOrgue.icns" ${GENERATED_ICONS_DIR}/*{16,32,128,256,512,1024}.png DEPENDS ${GENERATED_ICONS})
+    INSTALL(FILES "${RESOURCEDIR}/GrandOrgue.icns" DESTINATION "${RESOURCEINSTDIR}")
+    LIST(APPEND DEPLIST "${RESOURCEDIR}/GrandOrgue.icns")
+ elseif(UNIX)
diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix
index 771bef276221..7b3be4d9bb0d 100644
--- a/pkgs/applications/audio/grandorgue/default.nix
+++ b/pkgs/applications/audio/grandorgue/default.nix
@@ -21,22 +21,17 @@
 
 stdenv.mkDerivation rec {
   pname = "grandorgue";
-  version = "3.15.1-1";
+  version = "3.15.2-1";
 
   src = fetchFromGitHub {
     owner = "GrandOrgue";
     repo = "grandorgue";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-5uAA878OBc04PkUgCwoRtc6lIASivq3YcfFffTae6uM=";
+    hash = "sha256-U0DAWCzhXqdL2klSFQjnLiWp7yTdw/n0dmNUJSAg/5c=";
   };
 
-  postPatch = ''
-    substituteInPlace resources/CMakeLists.txt \
-      --replace \
-        "iconutil -c icns \''${GENERATED_ICONS_DIR}" \
-        "png2icns \''${GENERATED_ICONS_DIR}/../GrandOrgue.icns \''${GENERATED_ICONS_DIR}/*{16,32,128,256,512,1024}.png" \
-  '';
+  patches = [ ./darwin-fixes.patch ];
 
   nativeBuildInputs = [ cmake pkg-config imagemagick libicns makeWrapper ];