diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2012-03-21 10:47:00 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2012-03-21 10:47:00 +0000 |
| commit | 4233eece197f713e981bef3a12369ac229638cc0 (patch) | |
| tree | a4a594eb19549973101097ad5cbca05daea57162 /pkgs/development/libraries/webkit | |
| parent | ba7f02630ad4e02a43993ff0eba4ed5c22fa1119 (diff) | |
| download | nixlib-4233eece197f713e981bef3a12369ac229638cc0.tar nixlib-4233eece197f713e981bef3a12369ac229638cc0.tar.gz nixlib-4233eece197f713e981bef3a12369ac229638cc0.tar.bz2 nixlib-4233eece197f713e981bef3a12369ac229638cc0.tar.lz nixlib-4233eece197f713e981bef3a12369ac229638cc0.tar.xz nixlib-4233eece197f713e981bef3a12369ac229638cc0.tar.zst nixlib-4233eece197f713e981bef3a12369ac229638cc0.zip | |
Update and fix WebKit
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33323
Diffstat (limited to 'pkgs/development/libraries/webkit')
| -rw-r--r-- | pkgs/development/libraries/webkit/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/webkit/src-for-default.nix | 10 |
2 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index 7ad894215df3..c0fd878e0bb5 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -14,6 +14,7 @@ rec { sqlite icu gperf bison flex autoconf automake libtool perl intltool pkgconfig libsoup gtkdoc libXt libproxy enchant python ruby which renderproto libXrender geoclue + kbproto ]; propagatedBuildInputs = [ @@ -25,22 +26,20 @@ rec { "--enable-web-sockets" "--enable-web-timing" - # https://bugs.webkit.org/show_bug.cgi?id=55294 - # "--enable-image-resizer" - "--enable-geolocation" # Not implemented? - # "--enable-web-audio" + #"--enable-web-audio" "--enable-mathml" #"--enable-wml" # 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" @@ -48,10 +47,10 @@ rec { "--enable-blob" # https://bugs.webkit.org/show_bug.cgi?id=59430 - # "--enable-directory-upload" + #"--enable-directory-upload" # https://bugs.webkit.org/show_bug.cgi?id=58443 - # "--enable-file-system" + #"--enable-file-system" ]; /* doConfigure should be specified separately */ diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix index 5f5149fedfe6..30e129e2faef 100644 --- a/pkgs/development/libraries/webkit/src-for-default.nix +++ b/pkgs/development/libraries/webkit/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.4.0"; - name="webkit-1.4.0"; - hash="123zllzlnkjgw4d2ag73dvrjmkikbapxlz5730ps6y4qm43gxc1y"; - url="http://webkitgtk.org/webkit-1.4.0.tar.gz"; - advertisedUrl="http://webkitgtk.org/webkit-1.4.0.tar.gz"; + version="1.6.3"; + name="webkit-1.6.3"; + hash="1hvph13ak7a85qmj1ikanwxf2nn53m5f6a50j627lp49db7dpl0j"; + url="http://webkitgtk.org/webkit-1.6.3.tar.xz"; + advertisedUrl="http://webkitgtk.org/webkit-1.6.3.tar.xz"; } |