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

Update and fix WebKit

Browse Source 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33323
This commit is contained in:
Michael Raskin 2012-03-21 10:47:00 +00:00
parent ba7f02630a
commit 4233eece19
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libxml2/default.nix
View File

@ -3,11 +3,11 @@
assert pythonSupport -> python != null; assert pythonSupport -> python != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libxml2-2.7.7"; name = "libxml2-2.7.8";
src = fetchurl { src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.7.tar.gz; url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.8.tar.gz;
sha256 = "03kkknm7xl77qfdig8mzalsi8ljsyblzin18gy3h8zranffrpyzs"; sha256 = "6a33c3a2d18b902cd049e0faa25dd39f9b554a5b09a3bb56ee07dd7938b11c54";
}; };
configureFlags = '' configureFlags = ''

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

@ -14,6 +14,7 @@ rec {
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 python ruby which renderproto libXrender geoclue enchant python ruby which renderproto libXrender geoclue
kbproto
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -25,22 +26,20 @@ rec {
"--enable-web-sockets" "--enable-web-sockets"
"--enable-web-timing" "--enable-web-timing"
# https://bugs.webkit.org/show_bug.cgi?id=55294
# "--enable-image-resizer"
"--enable-geolocation" "--enable-geolocation"
# Not implemented? # Not implemented?
# "--enable-web-audio" #"--enable-web-audio"
"--enable-mathml" "--enable-mathml"
#"--enable-wml" #"--enable-wml"
# https://bugs.webkit.org/show_bug.cgi?id=45110 # https://bugs.webkit.org/show_bug.cgi?id=45110
# "--enable-indexed-database" #"--enable-indexed-database"
"--enable-xhtmlmp" # Doesn't work in release...
#"--enable-xhtmlmp"
# "--enable-input-speech" # "--enable-input-speech"
@ -48,10 +47,10 @@ rec {
"--enable-blob" "--enable-blob"
# https://bugs.webkit.org/show_bug.cgi?id=59430 # https://bugs.webkit.org/show_bug.cgi?id=59430
# "--enable-directory-upload" #"--enable-directory-upload"
# https://bugs.webkit.org/show_bug.cgi?id=58443 # https://bugs.webkit.org/show_bug.cgi?id=58443
# "--enable-file-system" #"--enable-file-system"
]; ];
/* 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="1.4.0"; version="1.6.3";
name="webkit-1.4.0"; name="webkit-1.6.3";
hash="123zllzlnkjgw4d2ag73dvrjmkikbapxlz5730ps6y4qm43gxc1y"; hash="1hvph13ak7a85qmj1ikanwxf2nn53m5f6a50j627lp49db7dpl0j";
url="http://webkitgtk.org/webkit-1.4.0.tar.gz"; url="http://webkitgtk.org/webkit-1.6.3.tar.xz";
advertisedUrl="http://webkitgtk.org/webkit-1.4.0.tar.gz"; advertisedUrl="http://webkitgtk.org/webkit-1.6.3.tar.xz";
} }

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

@ -4734,7 +4734,8 @@ let
webkit = webkit =
builderDefsPackage ../development/libraries/webkit { builderDefsPackage ../development/libraries/webkit {
inherit (gnome) gtkdoc libsoup; inherit (gnome) gtkdoc libsoup;
inherit gtk atk pango glib; inherit atk pango glib;
gtk = gtk3;
inherit freetype fontconfig gettext gperf curl inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libxml2 libxslt sqlite libjpeg libtiff libxml2 libxslt sqlite
icu cairo perl intltool automake libtool icu cairo perl intltool automake libtool
@ -4742,7 +4743,7 @@ let
python ruby which flex geoclue; python ruby which flex geoclue;
inherit gstreamer gst_plugins_base gst_ffmpeg inherit gstreamer gst_plugins_base gst_ffmpeg
gst_plugins_good; gst_plugins_good;
inherit (xlibs) libXt renderproto libXrender; inherit (xlibs) libXt renderproto libXrender kbproto;
libpng = libpng12; libpng = libpng12;
}; };