public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

webkit: hot-fix the build, use default libpng and perl

This commit is contained in:
Vladimír Čunát 2013-02-21 19:39:51 +01:00
parent b7ca8c801b
commit 3130d127f7
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/webkit/default.nix
View File

@ -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;
};
}

10
pkgs/top-level/all-packages.nix
View File

@ -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 { };