Skip to content

keepassxc: fix build with qt 5.11 #42381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xeji merged 1 commit into from
Jun 24, 2018
Merged

keepassxc: fix build with qt 5.11 #42381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pkgs/applications/misc/keepassx/community.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
15 changes: 15 additions & 0 deletions pkgs/applications/misc/keepassx/qt511.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <QMenu>
#include <QSortFilterProxyModel>
#include <QTemporaryFile>
+#include <QButtonGroup>
#include <QMimeData>
#include <QEvent>
#include <QColorDialog>
--
2.17.1