swift-im: fix build with Qt 5.11 and split QtWebKit
This commit is contained in:
parent
93a5947158
commit
205f3e941a
|
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
|
||||||
sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
|
sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./scons.patch ];
|
patches = [ ./qt-5.11.patch ./scons.patch ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig qttools scons ];
|
nativeBuildInputs = [ pkgconfig qttools scons ];
|
||||||
|
|
||||||
|
@ -28,6 +28,8 @@ in stdenv.mkDerivation rec {
|
||||||
NIX_CFLAGS_COMPILE = [
|
NIX_CFLAGS_COMPILE = [
|
||||||
"-I${libxml2.dev}/include/libxml2"
|
"-I${libxml2.dev}/include/libxml2"
|
||||||
"-I${miniupnpc}/include/miniupnpc"
|
"-I${miniupnpc}/include/miniupnpc"
|
||||||
|
"-I${qtwebkit.dev}/include/QtWebKit"
|
||||||
|
"-I${qtwebkit.dev}/include/QtWebKitWidgets"
|
||||||
];
|
];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
|
|
@ -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>
|
Loading…
Reference in a new issue