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-23 10:16:59 +0100 |
| commit | 3130d127f73aad2e0760a1232329b37475a46074 (patch) | |
| tree | d2f11fdedf4bb5e873c15e14fe1792ae64aea6f6 | |
| parent | b7ca8c801b6a74c2f19a567e188f7f3ad964508c (diff) | |
| download | nixpkgs-3130d127f73aad2e0760a1232329b37475a46074.tar nixpkgs-3130d127f73aad2e0760a1232329b37475a46074.tar.gz nixpkgs-3130d127f73aad2e0760a1232329b37475a46074.tar.bz2 nixpkgs-3130d127f73aad2e0760a1232329b37475a46074.tar.lz nixpkgs-3130d127f73aad2e0760a1232329b37475a46074.tar.xz nixpkgs-3130d127f73aad2e0760a1232329b37475a46074.tar.zst nixpkgs-3130d127f73aad2e0760a1232329b37475a46074.zip | |
webkit: hot-fix the build, use default libpng and perl
| -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 d229228b94f..1ba90e67d85 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 90452bf98c8..eb1296eae4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5032,7 +5032,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 @@ -5042,8 +5042,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 = @@ -5058,8 +5057,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 = @@ -5074,7 +5072,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 { }; |