diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-08-02 18:09:54 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-08-02 18:09:54 +0000 |
| commit | 91abf1a1deb82bdfbd14e8d6b49d20bdef5cff9b (patch) | |
| tree | 15251a7c18b8ccef7438549e1b6de989f34c08a4 /pkgs | |
| parent | 9e8792548d67497b7f673f75d243f5ef98be7a5f (diff) | |
| download | nixpkgs-91abf1a1deb82bdfbd14e8d6b49d20bdef5cff9b.tar nixpkgs-91abf1a1deb82bdfbd14e8d6b49d20bdef5cff9b.tar.gz nixpkgs-91abf1a1deb82bdfbd14e8d6b49d20bdef5cff9b.tar.bz2 nixpkgs-91abf1a1deb82bdfbd14e8d6b49d20bdef5cff9b.tar.lz nixpkgs-91abf1a1deb82bdfbd14e8d6b49d20bdef5cff9b.tar.xz nixpkgs-91abf1a1deb82bdfbd14e8d6b49d20bdef5cff9b.tar.zst nixpkgs-91abf1a1deb82bdfbd14e8d6b49d20bdef5cff9b.zip | |
Updating WebKit from a relatively unfortunate version
svn path=/nixpkgs/trunk/; revision=16531
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/webkit/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index bd7a79b4ef1..e0b744b7400 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -1,9 +1,9 @@ args : with args; -let version = lib.attrByPath ["version"] "r46507" args; in +let version = lib.attrByPath ["version"] "r46684" args; in rec { src = fetchurl { url = "http://nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2"; - sha256 = "18l435dgg3spgz10z05gw6cyxcm71y01l3qxy38ik43brws1hsvy"; + sha256 = "0rvmz1w83slkp8khvnq8akjbd2nfwz4miq6fg0d6nkxd83d9i7d3"; }; buildInputs = [gtk atk cairo curl fontconfig freetype @@ -17,7 +17,7 @@ rec { configureFlags = []; /* doConfigure should be specified separately */ - phaseNames = ["setVars" "fixTypos" "paranoidFixComments" "doConfigure" (doPatchShebangs ".") + phaseNames = ["setVars" "paranoidFixComments" "doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"]; setVars = fullDepEntry ('' @@ -40,10 +40,6 @@ rec { sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h') '') ["minInit" "doUnpack"]; - fixTypos = fullDepEntry ('' - sed -e 's@WebCore/workers/DedicatedWorkerThread.h$@& \\@' -i WebCore/GNUmakefile.am - '') ["minInit" "doUnpack"]; - name = "webkit-" + version; meta = { description = "WebKit - a fast and correct HTML renderer"; |