From 722137507f669e822d4acc3d47d5257ef3c93e28 Mon Sep 17 00:00:00 2001
From: Matthew_Cash <matthew@matthew-cash.com>
Date: Sun, 20 Aug 2023 20:28:04 -0700
Subject: [PATCH] gaphor: fix double wrapping

---
 pkgs/tools/misc/gaphor/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix
index a97b887f1ca..48f9fa7a7bb 100644
--- a/pkgs/tools/misc/gaphor/default.nix
+++ b/pkgs/tools/misc/gaphor/default.nix
@@ -59,7 +59,7 @@ buildPythonApplication rec {
     desktopName = "Gaphor";
   };
 
-  # We need to wrap it manually to resolve all icons
+  # Disable automatic wrapGAppsHook to prevent double wrapping
   dontWrapGApps = true;
 
   postInstall = ''
@@ -67,10 +67,11 @@ buildPythonApplication rec {
   '';
 
   preFixup = ''
-    wrapProgram $out/bin/gaphor \
-        ''${gappsWrapperArgs[@]} \
-        --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
-        --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+    makeWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
+      --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+    )
   '';
 
   meta = with lib; {