diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index b4beab05acd18..cc01de7f14f36 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -22,6 +22,7 @@ , qtx11extras , quazip , readline +, wrapGAppsHook , wrapQtAppsHook , yubikey-personalization , zlib @@ -90,7 +91,9 @@ stdenv.mkDerivation rec { runHook postCheck ''; - nativeBuildInputs = [ asciidoctor cmake wrapQtAppsHook qttools pkg-config ]; + nativeBuildInputs = [ asciidoctor cmake wrapGAppsHook wrapQtAppsHook qttools pkg-config ]; + + dontWrapGApps = true; buildInputs = [ curl @@ -115,7 +118,9 @@ stdenv.mkDerivation rec { ++ optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication; - preFixup = optionalString stdenv.isDarwin '' + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + '' + optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. wrapQtApp $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC '';