pyrox.dev / nixpkgs
lol
fork atom

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

authored by

Jun Hao and committed by
Franz Pletz 5bf4a9ff 39da5752

+25 -16
unified split
+4 -4
pkgs/development/libraries/webkitgtk/2.4.nix
··· 2 , pkgconfig, which, gettext, gobjectIntrospection 3 , gtk2, gtk3, wayland, libwebp, enchant, sqlite 4 , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg 5 - , gst-plugins-base 6 , withGtk2 ? false 7 , enableIntrospection ? !stdenv.isDarwin 8 , enableCredentialStorage ? !stdenv.isDarwin ··· 21 description = "Web content rendering engine, GTK+ port"; 22 homepage = "http://webkitgtk.org/"; 23 license = licenses.bsd2; 24 - platforms = platforms.linux; 25 maintainers = []; 26 }; 27 ··· 38 patches = [ 39 ./webcore-svg-libxml-cflags.patch 40 ] ++ optionals stdenv.isDarwin [ 41 - ./impure-icucore.patch 42 ./quartz-webcore.patch 43 ./libc++.patch 44 ./plugin-none.patch ··· 76 ] ++ optionals enableCredentialStorage [ 77 libsecret 78 ] ++ (if stdenv.isDarwin then [ 79 - readline libedit 80 ] else [ 81 wayland 82 ]);
··· 2 , pkgconfig, which, gettext, gobjectIntrospection 3 , gtk2, gtk3, wayland, libwebp, enchant, sqlite 4 , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg 5 + , gst-plugins-base, libobjc 6 , withGtk2 ? false 7 , enableIntrospection ? !stdenv.isDarwin 8 , enableCredentialStorage ? !stdenv.isDarwin ··· 21 description = "Web content rendering engine, GTK+ port"; 22 homepage = "http://webkitgtk.org/"; 23 license = licenses.bsd2; 24 + platforms = with platforms; linux ++ darwin; 25 maintainers = []; 26 }; 27 ··· 38 patches = [ 39 ./webcore-svg-libxml-cflags.patch 40 ] ++ optionals stdenv.isDarwin [ 41 + ./configure.patch 42 ./quartz-webcore.patch 43 ./libc++.patch 44 ./plugin-none.patch ··· 76 ] ++ optionals enableCredentialStorage [ 77 libsecret 78 ] ++ (if stdenv.isDarwin then [ 79 + readline libedit libobjc 80 ] else [ 81 wayland 82 ]);
+20
pkgs/development/libraries/webkitgtk/configure.patch
···
··· 1 + --- webkitgtk-2.4.11-orig/configure 2016-04-10 17:00:06.000000000 +0800 2 + +++ webkitgtk-2.4.11/configure 2016-07-21 23:04:10.000000000 +0800 3 + @@ -17738,7 +17738,7 @@ 4 + cat >>confdefs.h <<_ACEOF 5 + #define HAVE_WEBP_DECODE_H 1 6 + _ACEOF 7 + - WEBP_LIBS='-lwebp' 8 + + WEBP_LIBS=`$PKG_CONFIG --libs libwebp` 9 + else 10 + as_fn_error $? "WebP library (libwebp) not found" "$LINENO" 5 11 + fi 12 + @@ -18388,7 +18388,7 @@ 13 + case "$host" in 14 + *-*-darwin*) 15 + UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu" 16 + - UNICODE_LIBS="-licucore" 17 + + UNICODE_LIBS="/usr/lib/libicucore.dylib" 18 + ;; 19 + *-*-mingw*) 20 +
-12
pkgs/development/libraries/webkitgtk/impure-icucore.patch
··· 1 - diff -ru webkitgtk-2.4.9-orig/configure webkitgtk-2.4.9/configure 2 - --- webkitgtk-2.4.9-orig/configure 2016-02-02 13:23:22.000000000 -0500 3 - +++ webkitgtk-2.4.9/configure 2016-02-02 13:24:13.000000000 -0500 4 - @@ -17715,7 +17715,7 @@ 5 - case "$host" in 6 - *-*-darwin*) 7 - UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu" 8 - - UNICODE_LIBS="-licucore" 9 - + UNICODE_LIBS="/usr/lib/libicucore.dylib" 10 - ;; 11 - *-*-mingw*) 12 -
···
+1
pkgs/top-level/all-packages.nix
··· 9620 webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix { 9621 harfbuzz = harfbuzz-icu; 9622 gst-plugins-base = gst_all_1.gst-plugins-base; 9623 }; 9624 9625 webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix {
··· 9620 webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix { 9621 harfbuzz = harfbuzz-icu; 9622 gst-plugins-base = gst_all_1.gst-plugins-base; 9623 + inherit (darwin) libobjc; 9624 }; 9625 9626 webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix {