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

Correctly pass libsoup_git_head to webkit and packages using it

Browse Source 
svn path=/nixpkgs/trunk/; revision=16822
This commit is contained in:
Michael Raskin
2009-08-24 05:23:27 +00:00
parent 0e6cd4b794
commit 6496dbbbc5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+3 -3
View File
@@ -4125,7 +4125,7 @@ let
}; };
webkit = builderDefsPackage (import ../development/libraries/webkit) { webkit = builderDefsPackage (import ../development/libraries/webkit) {
inherit (gnome26) libsoup_git_head; libsoup = gnome26.libsoup_git_head;
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,7 +6767,7 @@ let
which gettext makeWrapper file libidn sqlite docutils libnotify; which gettext makeWrapper file libidn sqlite docutils libnotify;
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
inherit (gnome) gtksourceview; inherit (gnome) gtksourceview;
inherit (gnome26) libsoup; libsoup = gnome26.libsoup_git_head;
}; };
minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") { minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") {
@@ -7210,7 +7210,7 @@ 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;
inherit (gnome26) libsoup; libsoup = gnome26.libsoup_git_head;
}; };
valknut = import ../applications/networking/p2p/valknut { valknut = import ../applications/networking/p2p/valknut {