From 3db3cfe4bd63466fba231ef2c11c33d3d28e54f7 Mon Sep 17 00:00:00 2001 From: Thorsten Weber Date: Sun, 24 Jun 2018 19:32:53 +0200 Subject: [PATCH] keepassxc: fix build see https://github.com/keepassxreboot/keepassxc/commit/3bbc6ac0e6298d27bfe0c41999460cafda8edf18#diff-c6ef17e5536e3e1f6bfb1545fa1fb2dc --- pkgs/applications/misc/keepassx/community.nix | 5 ++++- .../misc/keepassx/keepassxc-qt-5.11.patch | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/keepassx/keepassxc-qt-5.11.patch diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6b37f9b9145d9..a30a5cd84a3f9 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -47,7 +47,10 @@ stdenv.mkDerivation rec { --replace "/usr/local/share/man" "../share/man" ''; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; - patches = [ ./darwin.patch ]; + patches = [ + ./darwin.patch + ./keepassxc-qt-5.11.patch + ]; cmakeFlags = [ "-DKEEPASSXC_BUILD_TYPE=Release" diff --git a/pkgs/applications/misc/keepassx/keepassxc-qt-5.11.patch b/pkgs/applications/misc/keepassx/keepassxc-qt-5.11.patch new file mode 100644 index 0000000000000..734e950097b8b --- /dev/null +++ b/pkgs/applications/misc/keepassx/keepassxc-qt-5.11.patch @@ -0,0 +1,11 @@ +fixes build with qt 5.11 +--- a/src/gui/entry/EditEntryWidget.cpp ++++ b/src/gui/entry/EditEntryWidget.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include + #include ++#include + + #include "autotype/AutoType.h"