public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt511.qtwebkit: fix on darwin

Browse Source 
readline is used on macOS and iOS for some javascript console (JSC). It
seems to be easier to disable it than to fix it.
This commit is contained in:
Dmitry Kalinkin
2019-02-19 23:52:06 -05:00
parent 67186defda
commit 4bbd00e934
7 changed files with 129 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+7 -2
View File
@@ -8,7 +8,7 @@
}:
let
inherit (lib) optional optionals getLib;
inherit (lib) optional optionals getDev getLib;
hyphen = stdenv.mkDerivation rec {
name = "hyphen-2.8.8";
src = fetchurl {
@@ -34,7 +34,12 @@ qtModule {
bison2 flex gdb gperf perl pkgconfig python2 ruby
] ++ optional usingAnnulenWebkitFork cmake;
cmakeFlags = optional usingAnnulenWebkitFork "-DPORT=Qt";
cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ]
++ optionals stdenv.isDarwin [
"-DQt5Multimedia_DIR=${getDev qtmultimedia}/lib/cmake/Qt5Multimedia"
"-DQt5MultimediaWidgets_DIR=${getDev qtmultimedia}/lib/cmake/Qt5MultimediaWidgets"
"-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF"
]);
# QtWebKit overrides qmake's default_pre and default_post features,
# so its custom qmake files must be found first at the front of QMAKEPATH.