diff options
| author | averelld <averelld@users.noreply.github.com> | 2018-06-24 20:38:51 +0200 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-24 20:38:51 +0200 |
| commit | 32b2f28e609c864a32fc130968ed2e3dbebf0b6a (patch) | |
| tree | e6e87aa249ab8aa37f845cd07b5ee55311d9f982 /pkgs/applications/misc/keepassx | |
| parent | 7d7b2de34db73ce7e4ec91b43226fef222866313 (diff) | |
| download | nixpkgs-32b2f28e609c864a32fc130968ed2e3dbebf0b6a.tar nixpkgs-32b2f28e609c864a32fc130968ed2e3dbebf0b6a.tar.gz nixpkgs-32b2f28e609c864a32fc130968ed2e3dbebf0b6a.tar.bz2 nixpkgs-32b2f28e609c864a32fc130968ed2e3dbebf0b6a.tar.lz nixpkgs-32b2f28e609c864a32fc130968ed2e3dbebf0b6a.tar.xz nixpkgs-32b2f28e609c864a32fc130968ed2e3dbebf0b6a.tar.zst nixpkgs-32b2f28e609c864a32fc130968ed2e3dbebf0b6a.zip | |
keepassxc: fix build with qt 5.11 (#42381)
Diffstat (limited to 'pkgs/applications/misc/keepassx')
| -rw-r--r-- | pkgs/applications/misc/keepassx/community.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/misc/keepassx/qt511.patch | 15 |
2 files changed, 20 insertions, 1 deletions
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6b37f9b9145..5c5769db1b4 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 00000000000..b4d312c8c26 --- /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 <QMenu> + #include <QSortFilterProxyModel> + #include <QTemporaryFile> ++#include <QButtonGroup> + #include <QMimeData> + #include <QEvent> + #include <QColorDialog> +-- +2.17.1 + |