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

Try updating WebKit. Dependency check passes; will abuse Hydra to build it all.

Browse Source 
svn path=/nixpkgs/trunk/; revision=22304
This commit is contained in:
Michael Raskin 2010-06-17 05:20:16 +00:00
parent 1daa883f8c
commit b24d67c772
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ rec {
gettext libjpeg libpng libtiff libxml2 libxslt pango gettext libjpeg libpng libtiff libxml2 libxslt pango
sqlite icu gperf bison flex autoconf automake libtool sqlite icu gperf bison flex autoconf automake libtool
perl intltool pkgconfig libsoup gtkdoc libXt libproxy perl intltool pkgconfig libsoup gtkdoc libXt libproxy
enchant enchant python ruby
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -23,10 +23,15 @@ rec {
configureCommand = "./autogen.sh "; configureCommand = "./autogen.sh ";
configureFlags = [ configureFlags = [
"--enable-3D-transforms" "--enable-3D-transforms"
"--enable-filters"
"--enable-web-sockets" "--enable-web-sockets"
# WML fails recent builds.. "--enable-indexeddb"
# "--enable-wml" "--enable-image-resizer"
"--enable-xhtmlmp"
"--enable-mathml"
"--enable-wml"
"--enable-blob-slice"
"--enable-file-reader"
"--enable-file-writer"
]; ];
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */

10
pkgs/development/libraries/webkit/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec { rec {
version="r53178"; version="r61173";
name="webkit-r53178"; name="webkit-r61173";
hash="0452kfqd73igmkgp0v4w13lk3ycypqz4zl9hnspg7ns5vlyknqcn"; hash="1gmqgf3scbac682dkbzrfkl876y46j8rxd9asjqcx7xm4m6hrlkn";
url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r53178.tar.bz2"; url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r61173.tar.bz2";
advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r53178.tar.bz2"; advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r61173.tar.bz2";
} }

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

@ -5363,7 +5363,8 @@ let
inherit freetype fontconfig gettext gperf curl inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant; pkgconfig autoconf bison libproxy enchant
python ruby;
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood; gstPluginsGood;
flex = flex2535; flex = flex2535;