diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2009-09-30 05:37:09 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2009-09-30 05:37:09 +0000 |
commit | e7ccbf5a2bf2913b8a3e50d60ecb509295b4d839 (patch) | |
tree | c46da7d898c5e656cd663e1a6be6cd5bf2791036 /pkgs/development/libraries/webkit | |
parent | 6b7368acfc01295995a463e5bccbcea8dcdf0182 (diff) | |
download | nixlib-e7ccbf5a2bf2913b8a3e50d60ecb509295b4d839.tar nixlib-e7ccbf5a2bf2913b8a3e50d60ecb509295b4d839.tar.gz nixlib-e7ccbf5a2bf2913b8a3e50d60ecb509295b4d839.tar.bz2 nixlib-e7ccbf5a2bf2913b8a3e50d60ecb509295b4d839.tar.lz nixlib-e7ccbf5a2bf2913b8a3e50d60ecb509295b4d839.tar.xz nixlib-e7ccbf5a2bf2913b8a3e50d60ecb509295b4d839.tar.zst nixlib-e7ccbf5a2bf2913b8a3e50d60ecb509295b4d839.zip |
Now we have fresh GTK/Gnome; try updating WebKit
svn path=/nixpkgs/trunk/; revision=17521
Diffstat (limited to 'pkgs/development/libraries/webkit')
-rw-r--r-- | pkgs/development/libraries/webkit/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/webkit/src-for-default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/webkit/src-info-for-default.nix | 1 |
3 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index 9b1ab8ee09fc..3788aff00b00 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -25,13 +25,8 @@ rec { "--enable-3D-transforms" "--enable-filters" "--enable-web-sockets" - # Fails the build.. - # "--enable-shared-workers" - # WML support causes crash on - # Slashdot.org. It is fixed upstream, - # but the required update is too big - # Let us wait for a GTK release.. - #"--enable-wml" + # GTK release! + "--enable-wml" ]; /* doConfigure should be specified separately */ @@ -59,7 +54,7 @@ rec { sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h') '') ["minInit" "doUnpack"]; - name = "webkit-" + version; + name = s.name; meta = { description = "WebKit - a fast and correct HTML renderer"; maintainers = [stdenv.lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix index 8e9bb08f57df..e1b3fe07d81d 100644 --- a/pkgs/development/libraries/webkit/src-for-default.nix +++ b/pkgs/development/libraries/webkit/src-for-default.nix @@ -1,6 +1,9 @@ rec { - advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r47011.tar.bz2"; - version = "r47011"; - url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2"; - hash = "03lzw3hh7nnbwb8vyv98lgqqgpmd4pc536z7xfn47yg4q76069wq"; + version="r48908"; + name="webkit-r48908"; + hash="18hymchzix56yhl830mxfiayxxjhd5kgm3ga4jc9k627ypqsdycg"; + url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r48908.tar.bz2"; + advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r48908.tar.bz2"; + + } diff --git a/pkgs/development/libraries/webkit/src-info-for-default.nix b/pkgs/development/libraries/webkit/src-info-for-default.nix index be2a68b58e25..994cae544cb2 100644 --- a/pkgs/development/libraries/webkit/src-info-for-default.nix +++ b/pkgs/development/libraries/webkit/src-info-for-default.nix @@ -2,4 +2,5 @@ downloadPage = "http://nightly.webkit.org/"; versionExtractorSedScript = "s/.*-(r[0-9]+)[.].*/\\1/"; versionReferenceCreator = "s/-(r[0-9.]+)[.]/-\${version}./"; + baseName = "webkit"; } |