diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-09-04 09:24:38 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-09-04 09:39:06 +0000 |
| commit | 205f3e941a6fff6b8bb12fc20dfdd76ba3d64455 (patch) | |
| tree | 5e387060eca26c89f212ce1bbc67839d02d68212 /pkgs/applications/networking/instant-messengers | |
| parent | 93a594715881e626a61488042a5796d253914f7e (diff) | |
| download | nixlib-205f3e941a6fff6b8bb12fc20dfdd76ba3d64455.tar nixlib-205f3e941a6fff6b8bb12fc20dfdd76ba3d64455.tar.gz nixlib-205f3e941a6fff6b8bb12fc20dfdd76ba3d64455.tar.bz2 nixlib-205f3e941a6fff6b8bb12fc20dfdd76ba3d64455.tar.lz nixlib-205f3e941a6fff6b8bb12fc20dfdd76ba3d64455.tar.xz nixlib-205f3e941a6fff6b8bb12fc20dfdd76ba3d64455.tar.zst nixlib-205f3e941a6fff6b8bb12fc20dfdd76ba3d64455.zip | |
swift-im: fix build with Qt 5.11 and split QtWebKit
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/swift-im/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index e3b3d7191892..8316c560b069 100644 --- 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 = '' diff --git a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch new file mode 100644 index 000000000000..911e7570427f --- /dev/null +++ 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> |