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

Roll back to older WebKit anyway pending a GTK update

Browse Source 
svn path=/nixpkgs/trunk/; revision=16836
This commit is contained in:
Michael Raskin 2009-08-24 18:22:58 +00:00
parent c4b524f2fa
commit 85849fdfdd
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/uzbl/default.nix
View File

@ -32,9 +32,6 @@ rec {
''; '';
installFlags = "PREFIX=$out"; installFlags = "PREFIX=$out";
makeFlags = [
"CC='gcc ${a.glib}/lib/libglib-2.0.so ${a.glib}/lib/libgio-2.0.so ${a.glib}/lib/libgobject-2.0.so' "
];
name = "uzbl-" + version; name = "uzbl-" + version;
meta = { meta = {

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

@ -27,7 +27,11 @@ rec {
"--enable-web-sockets" "--enable-web-sockets"
# Fails the build.. # Fails the build..
# "--enable-shared-workers" # "--enable-shared-workers"
"--enable-wml" # 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"
]; ];
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */

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

@ -1,6 +1,6 @@
rec { rec {
advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r47686.tar.bz2"; advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r47291.tar.bz2";
version = "r47686"; version = "r47291";
url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2"; url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2";
hash = "1h1frvvp8hfv3q2drjnrpgadgin55p7nv8747kxxhdkj4gv9dzqg"; hash = "14rggsgpsaxfph1967hbwlz814d8zyzl6xwzl7a25f6zf1nwcjdk";
} }

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

@ -3202,7 +3202,7 @@ let
inherit (gtkLibs) glib pango gtk; inherit (gtkLibs) glib pango gtk;
inherit (gnome) gnomevfs /* <- only passed for the no longer used older versions inherit (gnome) gnomevfs /* <- only passed for the no longer used older versions
it is depreceated and didn't build on amd64 due to samba dependenccy */ gtkdoc; it is depreceated and didn't build on amd64 due to samba dependenccy */ gtkdoc;
libsoup = gnome26.libsoup_git_head; libsoup = gnome26.libsoup;
}); });
gnet = import ../development/libraries/gnet { gnet = import ../development/libraries/gnet {
@ -4125,7 +4125,7 @@ let
}; };
webkit = builderDefsPackage (import ../development/libraries/webkit) { webkit = builderDefsPackage (import ../development/libraries/webkit) {
libsoup = gnome26.libsoup_git_head; libsoup = gnome26.libsoup;
inherit (gnome) gtkdoc; inherit (gnome) gtkdoc;
inherit (gtkLibs) gtk atk pango; inherit (gtkLibs) gtk atk pango;
inherit freetype fontconfig gettext gperf curl inherit freetype fontconfig gettext gperf curl
@ -6767,8 +6767,8 @@ let
which gettext makeWrapper file libidn sqlite docutils libnotify; which gettext makeWrapper file libidn sqlite docutils libnotify;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) gtksourceview; inherit (gnome) gtksourceview;
libsoup = gnome26.libsoup_git_head; libsoup = gnome26.libsoup;
glib = gtkLibs.glib_2_21; glib = gtkLibs.glib;
}; };
minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") { minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") {
@ -7211,8 +7211,8 @@ let
uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) { uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
inherit pkgconfig webkit makeWrapper; inherit pkgconfig webkit makeWrapper;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
libsoup = gnome26.libsoup_git_head; libsoup = gnome26.libsoup;
glib = gtkLibs.glib_2_21; glib = gtkLibs.glib;
}; };
valknut = import ../applications/networking/p2p/valknut { valknut = import ../applications/networking/p2p/valknut {

2
pkgs/top-level/release.nix
View File

@ -238,7 +238,7 @@ in {
mdadm = linux; mdadm = linux;
mercurial = allBut "i686-cygwin"; mercurial = allBut "i686-cygwin";
mesa = linux ++ darwin; mesa = linux ++ darwin;
#midori = linux; midori = linux;
mingetty = linux; mingetty = linux;
mk = linux; mk = linux;
mktemp = all; mktemp = all;