swift-im: fix build with Qt 5.11 and split QtWebKit

2018-09-04 09:24:38 +00:00 · 2018-09-04 09:24:38 +00:00 · 205f3e941a
commit 205f3e941a
parent 93a5947158
2 changed files with 13 additions and 1 deletions
--- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix
+++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
    sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
  };

-  patches = [ ./scons.patch ];
+  patches = [ ./qt-5.11.patch ./scons.patch ];

  nativeBuildInputs = [ pkgconfig qttools scons ];

@ -28,6 +28,8 @@ in stdenv.mkDerivation rec {
  NIX_CFLAGS_COMPILE = [
    "-I${libxml2.dev}/include/libxml2"
    "-I${miniupnpc}/include/miniupnpc"
+    "-I${qtwebkit.dev}/include/QtWebKit"
+    "-I${qtwebkit.dev}/include/QtWebKitWidgets"
  ];

  buildPhase = ''
--- a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch
+++ b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch
@ -0,0 +1,10 @@
+--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+@@ -8,6 +8,7 @@
+
+ #include <set>
+
+#include <QAbstractItemModel>
+ #include <QWizard>
+
+ #include <Swiften/Base/Override.h>