From 1daf0125afd9c44723d16f6b3dad5fcbc3cde858 Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Sat, 28 May 2022 12:07:21 +0200
Subject: [PATCH] keepassxc: Wrap once

Using Qt *and* GTK means both wrapper hooks kick in, so avoid automatic
GTK wrapping and merge arguments into Qt ones as usual.

Duplicate wrapping must be avoided as it breaks the program's basename,
e.g. `argv[0]` ends up with ".keepassxc-wrapped" rather than
"keepassxc" as basename.

This fixes all three ELF executables (there is `-cli` and `-proxy`).
---
 pkgs/applications/misc/keepassx/community.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 3daebeaabc97..fdac7cede170 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -87,6 +87,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ asciidoctor cmake wrapGAppsHook wrapQtAppsHook qttools pkg-config ];
 
+  dontWrapGApps = true;
+  postFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   buildInputs = [
     curl
     botan2