tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

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

Orivej Desh 205f3e94 93a59471

+13 -1
unified split
+3 -1
pkgs/applications/networking/instant-messengers/swift-im/default.nix
··· 14 sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; 15 }; 16 17 - patches = [ ./scons.patch ]; 18 19 nativeBuildInputs = [ pkgconfig qttools scons ]; 20 ··· 28 NIX_CFLAGS_COMPILE = [ 29 "-I${libxml2.dev}/include/libxml2" 30 "-I${miniupnpc}/include/miniupnpc" 31 ]; 32 33 buildPhase = ''
··· 14 sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; 15 }; 16 17 + patches = [ ./qt-5.11.patch ./scons.patch ]; 18 19 nativeBuildInputs = [ pkgconfig qttools scons ]; 20 ··· 28 NIX_CFLAGS_COMPILE = [ 29 "-I${libxml2.dev}/include/libxml2" 30 "-I${miniupnpc}/include/miniupnpc" 31 + "-I${qtwebkit.dev}/include/QtWebKit" 32 + "-I${qtwebkit.dev}/include/QtWebKitWidgets" 33 ]; 34 35 buildPhase = ''
+10
pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch
···
··· 1 + --- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h 2 + +++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h 3 + @@ -8,6 +8,7 @@ 4 + 5 + #include <set> 6 + 7 + +#include <QAbstractItemModel> 8 + #include <QWizard> 9 + 10 + #include <Swiften/Base/Override.h>