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

webkit: Update to 1.8.1 in attempt to fix build with new glib

Browse Source 
Sorry if my 'fixConfigure' is not idiomatic builderDefs, I've not used it before
This commit is contained in:
Shea Levy 2012-07-16 00:16:03 -04:00
parent 37cc7e80ad
commit 0ef65a6bab
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +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 kbproto mesa
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -54,7 +54,7 @@ rec {
]; ];
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["setVars" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") phaseNames = ["setVars" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".")
"doReplaceUsrBin" "doMakeInstall" "doAddPrograms"]; "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
setVars = fullDepEntry ('' setVars = fullDepEntry (''
@ -78,6 +78,13 @@ 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"];
# See http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2012-April/022893.html
fixConfigure = fullDepEntry (''
sed -i -e 's/=GSTREAMER_0_10_REQUIRED_VERSION/=\$GSTREAMER_0_10_REQUIRED_VERSION/' \
-e 's/=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/=\$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/' \
configure{,.ac}
'') ["minInit" "doUnpack"];
name = s.name; name = s.name;
meta = { meta = {
description = "WebKit - a fast and correct HTML renderer"; description = "WebKit - a fast and correct HTML renderer";

11
pkgs/development/libraries/webkit/src-for-default.nix
View File

@ -1,9 +1,10 @@
rec { rec {
version="1.6.3"; version="1.8.1";
name="webkit-1.6.3"; name="webkit-1.8.1";
hash="1hvph13ak7a85qmj1ikanwxf2nn53m5f6a50j627lp49db7dpl0j"; hash="0a1v3v8dp2cl332qr51j4fpl0rwpgxbf29hn3zdim9hcniv6l4ls";
url="http://webkitgtk.org/webkit-1.6.3.tar.xz"; url="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
advertisedUrl="http://webkitgtk.org/webkit-1.6.3.tar.xz"; advertisedUrl="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
} }

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

@ -4822,7 +4822,7 @@ let
libjpeg libtiff libxml2 libxslt sqlite libjpeg libtiff libxml2 libxslt sqlite
icu cairo intltool automake libtool icu cairo intltool automake libtool
pkgconfig autoconf bison libproxy enchant pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue; python ruby which flex geoclue mesa;
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 kbproto; inherit (xlibs) libXt renderproto libXrender kbproto;