keepassxc: fix build with qt 5.11 (#42381)

2018-06-24 20:38:51 +02:00 · 2018-06-24 20:38:51 +02:00 · 32b2f28e60
commit 32b2f28e60
parent 7d7b2de34d
2 changed files with 20 additions and 1 deletions
--- 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"
--- a/pkgs/applications/misc/keepassx/qt511.patch
+++ 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
+