Updating WebKit from a relatively unfortunate version
svn path=/nixpkgs/trunk/; revision=16531
This commit is contained in:
parent
9e8792548d
commit
91abf1a1de
|
@ -1,9 +1,9 @@
|
||||||
args : with args;
|
args : with args;
|
||||||
let version = lib.attrByPath ["version"] "r46507" args; in
|
let version = lib.attrByPath ["version"] "r46684" args; in
|
||||||
rec {
|
rec {
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2";
|
url = "http://nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2";
|
||||||
sha256 = "18l435dgg3spgz10z05gw6cyxcm71y01l3qxy38ik43brws1hsvy";
|
sha256 = "0rvmz1w83slkp8khvnq8akjbd2nfwz4miq6fg0d6nkxd83d9i7d3";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [gtk atk cairo curl fontconfig freetype
|
buildInputs = [gtk atk cairo curl fontconfig freetype
|
||||||
|
@ -17,7 +17,7 @@ rec {
|
||||||
configureFlags = [];
|
configureFlags = [];
|
||||||
|
|
||||||
/* doConfigure should be specified separately */
|
/* doConfigure should be specified separately */
|
||||||
phaseNames = ["setVars" "fixTypos" "paranoidFixComments" "doConfigure" (doPatchShebangs ".")
|
phaseNames = ["setVars" "paranoidFixComments" "doConfigure" (doPatchShebangs ".")
|
||||||
"doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
|
"doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
|
||||||
|
|
||||||
setVars = fullDepEntry (''
|
setVars = fullDepEntry (''
|
||||||
|
@ -40,10 +40,6 @@ rec {
|
||||||
sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
|
sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
|
||||||
'') ["minInit" "doUnpack"];
|
'') ["minInit" "doUnpack"];
|
||||||
|
|
||||||
fixTypos = fullDepEntry (''
|
|
||||||
sed -e 's@WebCore/workers/DedicatedWorkerThread.h$@& \\@' -i WebCore/GNUmakefile.am
|
|
||||||
'') ["minInit" "doUnpack"];
|
|
||||||
|
|
||||||
name = "webkit-" + version;
|
name = "webkit-" + version;
|
||||||
meta = {
|
meta = {
|
||||||
description = "WebKit - a fast and correct HTML renderer";
|
description = "WebKit - a fast and correct HTML renderer";
|
||||||
|
|
Loading…
Reference in New Issue