From 32b2f28e609c864a32fc130968ed2e3dbebf0b6a Mon Sep 17 00:00:00 2001 From: averelld Date: Sun, 24 Jun 2018 20:38:51 +0200 Subject: [PATCH] keepassxc: fix build with qt 5.11 (#42381) --- pkgs/applications/misc/keepassx/community.nix | 6 +++++- pkgs/applications/misc/keepassx/qt511.patch | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/keepassx/qt511.patch diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6b37f9b9145d..5c5769db1b46 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -47,7 +47,11 @@ 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 + ./qt511.patch + ]; cmakeFlags = [ "-DKEEPASSXC_BUILD_TYPE=Release" diff --git a/pkgs/applications/misc/keepassx/qt511.patch b/pkgs/applications/misc/keepassx/qt511.patch new file mode 100644 index 000000000000..b4d312c8c263 --- /dev/null +++ b/pkgs/applications/misc/keepassx/qt511.patch @@ -0,0 +1,15 @@ +diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp +index 6fd65c1a..e99275b0 100644 +--- a/src/gui/entry/EditEntryWidget.cpp ++++ b/src/gui/entry/EditEntryWidget.cpp +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.17.1 +