webkitgtk24x: fix libwebp missing library path, add libobjc as dependency on OSX (#17198)

3 files changed, 24 insertions, 16 deletions

diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index e6e61e0482cb..39c0eed0a543 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -2,7 +2,7 @@
 , pkgconfig, which, gettext, gobjectIntrospection
 , gtk2, gtk3, wayland, libwebp, enchant, sqlite
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg
-, gst-plugins-base
+, gst-plugins-base, libobjc
 , withGtk2 ? false
 , enableIntrospection ? !stdenv.isDarwin
 , enableCredentialStorage ? !stdenv.isDarwin
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "Web content rendering engine, GTK+ port";
     homepage = "http://webkitgtk.org/";
     license = licenses.bsd2;
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
     maintainers = [];
   };
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./webcore-svg-libxml-cflags.patch
   ] ++ optionals stdenv.isDarwin [
-    ./impure-icucore.patch
+    ./configure.patch
     ./quartz-webcore.patch
     ./libc++.patch
     ./plugin-none.patch
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
   ] ++ optionals enableCredentialStorage [
     libsecret
   ] ++ (if stdenv.isDarwin then [
-    readline libedit
+    readline libedit libobjc
   ] else [
     wayland
   ]);
diff --git a/pkgs/development/libraries/webkitgtk/configure.patch b/pkgs/development/libraries/webkitgtk/configure.patch
new file mode 100644
index 000000000000..2f4c1e7ad314
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/configure.patch
@@ -0,0 +1,20 @@
+--- webkitgtk-2.4.11-orig/configure	2016-04-10 17:00:06.000000000 +0800
++++ webkitgtk-2.4.11/configure	2016-07-21 23:04:10.000000000 +0800
+@@ -17738,7 +17738,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_WEBP_DECODE_H 1
+ _ACEOF
+- WEBP_LIBS='-lwebp'
++ WEBP_LIBS=`$PKG_CONFIG --libs libwebp`
+ else
+   as_fn_error $? "WebP library (libwebp) not found" "$LINENO" 5
+ fi
+@@ -18388,7 +18388,7 @@
+ case "$host" in
+     *-*-darwin*)
+         UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu"
+-        UNICODE_LIBS="-licucore"
++        UNICODE_LIBS="/usr/lib/libicucore.dylib"
+         ;;
+     *-*-mingw*)
+ 
diff --git a/pkgs/development/libraries/webkitgtk/impure-icucore.patch b/pkgs/development/libraries/webkitgtk/impure-icucore.patch
deleted file mode 100644
index 24bf690d8b8f..000000000000
--- a/pkgs/development/libraries/webkitgtk/impure-icucore.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru webkitgtk-2.4.9-orig/configure webkitgtk-2.4.9/configure
---- webkitgtk-2.4.9-orig/configure	2016-02-02 13:23:22.000000000 -0500
-+++ webkitgtk-2.4.9/configure	2016-02-02 13:24:13.000000000 -0500
-@@ -17715,7 +17715,7 @@
- case "$host" in
-     *-*-darwin*)
-         UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu"
--        UNICODE_LIBS="-licucore"
-+        UNICODE_LIBS="/usr/lib/libicucore.dylib"
-         ;;
-     *-*-mingw*)
-