diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-21 19:39:51 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-21 19:41:45 +0100 |
| commit | d13851c6a00350c83e589c6a11f4d29ee641c495 (patch) | |
| tree | 89aea6845356ca05c49ca8e54568d588a2c794ea /pkgs | |
| parent | acd4299e75a167a79521d76a1d312ca1cd8df92e (diff) | |
| download | nixlib-d13851c6a00350c83e589c6a11f4d29ee641c495.tar nixlib-d13851c6a00350c83e589c6a11f4d29ee641c495.tar.gz nixlib-d13851c6a00350c83e589c6a11f4d29ee641c495.tar.bz2 nixlib-d13851c6a00350c83e589c6a11f4d29ee641c495.tar.lz nixlib-d13851c6a00350c83e589c6a11f4d29ee641c495.tar.xz nixlib-d13851c6a00350c83e589c6a11f4d29ee641c495.tar.zst nixlib-d13851c6a00350c83e589c6a11f4d29ee641c495.zip | |
webkit: hot-fix the build, use default libpng and perl
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/webkit/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index d229228b94f7..1ba90e67d85f 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -9,7 +9,7 @@ rec { sha256 = s.hash; }; - buildInputs = [gtk glib atk cairo curl fontconfig freetype + buildInputs = [gtk gtk2 glib atk cairo curl fontconfig freetype gettext libjpeg libpng libtiff libxml2 libxslt pango sqlite icu gperf bison flex autoconf automake libtool perl intltool pkgconfig libsoup gtkdoc libXt libproxy @@ -91,6 +91,6 @@ rec { maintainers = [stdenv.lib.maintainers.raskin]; }; passthru = { - inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; + inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg libsoup; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 271022d8e7f4..a5ecbfd6e3a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5015,7 +5015,7 @@ let webkit = builderDefsPackage ../development/libraries/webkit { inherit (gnome) gtkdoc libsoup; - inherit atk pango glib; + inherit atk pango glib gtk2 /*for plugins etc. even with gtk3, see Gentoo ebuild*/; gtk = gtk3; inherit freetype fontconfig gettext gperf curl libjpeg libtiff libxml2 libxslt sqlite @@ -5025,8 +5025,7 @@ let inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; inherit (xlibs) libXt renderproto libXrender kbproto; - libpng = libpng12; - perl = perl510; + inherit libpng perl; }; webkit_gtk2 = @@ -5041,8 +5040,7 @@ let inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; inherit (xlibs) libXt renderproto libXrender; - libpng = libpng12; - perl = perl510; + inherit libpng perl; }; webkitSVN = @@ -5057,7 +5055,7 @@ let inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; inherit (xlibs) libXt renderproto libXrender; - libpng = libpng12; + inherit libpng; }; wvstreams = callPackage ../development/libraries/wvstreams { }; |