diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-02-17 21:33:15 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-02-19 23:51:19 -0500 |
| commit | f212dd2e32f51ab95b62c8cbad2c8b56a3b42dce (patch) | |
| tree | a1f7c2fdf756ca51149f5ad328eab2f99ba809a5 /pkgs/development/libraries/qt-5 | |
| parent | 55757a0d44d11c051648ce03ecfb8881ff4e4dc5 (diff) | |
| download | nixlib-f212dd2e32f51ab95b62c8cbad2c8b56a3b42dce.tar nixlib-f212dd2e32f51ab95b62c8cbad2c8b56a3b42dce.tar.gz nixlib-f212dd2e32f51ab95b62c8cbad2c8b56a3b42dce.tar.bz2 nixlib-f212dd2e32f51ab95b62c8cbad2c8b56a3b42dce.tar.lz nixlib-f212dd2e32f51ab95b62c8cbad2c8b56a3b42dce.tar.xz nixlib-f212dd2e32f51ab95b62c8cbad2c8b56a3b42dce.tar.zst nixlib-f212dd2e32f51ab95b62c8cbad2c8b56a3b42dce.zip | |
qt5.qtwebkit: link against libicucore.dylib from darwin.ICU instead of /usr/lib
The impure library was introduced in
775531c1e3 ('qt58: extend darwin compatibility')
cmake-based build can use a non-apple ICU if -DMACOS_USE_SYSTEM_ICU=OFF
is set.
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.9/qtwebkit.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 6 |
2 files changed, 1 insertions, 18 deletions
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch index c78cb58f564b..718bda361943 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch @@ -1,16 +1,3 @@ -diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri -index 69e4cd1f3..3f729a75e 100644 ---- a/Source/WTF/WTF.pri -+++ b/Source/WTF/WTF.pri -@@ -12,7 +12,7 @@ mac { - # Mac OS does ship libicu but not the associated header files. - # Therefore WebKit provides adequate header files. - INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH -- LIBS += -licucore -+ LIBS += /usr/lib/libicucore.dylib - } else:!use?(wchar_unicode): { - win32 { - CONFIG(static, static|shared) { diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp index a923d49aa..46772a4bb 100644 --- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 526fc2b8b2d1..64fb22770ec0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -27,7 +27,7 @@ qtModule { ++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia ++ optional (lib.versionAtLeast qtbase.version "5.11.0") qtwebchannel; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ] - ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private OpenGL ]) + ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private ICU OpenGL ]) ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ]; nativeBuildInputs = [ bison2 flex gdb gperf perl pkgconfig python2 ruby @@ -35,10 +35,6 @@ qtModule { cmakeFlags = optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-DPORT=Qt" ]; - __impureHostDeps = optionals (stdenv.isDarwin) [ - "/usr/lib/libicucore.dylib" - ]; - # QtWebKit overrides qmake's default_pre and default_post features, # so its custom qmake files must be found first at the front of QMAKEPATH. preConfigure = '' |