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

Fix build of libsoup 2.31

Browse Source 
svn path=/nixpkgs/trunk/; revision=26846
This commit is contained in:
Michael Raskin 2011-04-14 19:04:39 +00:00
parent 57fee7d679
commit bac6b69e18
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/gnome-2.28/default.nix
View File

@ -185,7 +185,8 @@ pkgs.makeOverridable
}; };
libsoup_2_31 = import ./desktop/libsoup/2.31.nix { libsoup_2_31 = import ./desktop/libsoup/2.31.nix {
inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl; inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite
curl libgcrypt;
inherit (pkgs.gtkLibs) glib; inherit (pkgs.gtkLibs) glib;
inherit GConf gnome_keyring; inherit GConf gnome_keyring;
}; };

4
pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl, {stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl,
glib, GConf, gnome_keyring}: glib, GConf, gnome_keyring, libgcrypt}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libsoup-2.31.2"; name = "libsoup-2.31.2";
@ -9,5 +9,5 @@ stdenv.mkDerivation {
}; };
patches = [./2.31.gnutls.patch]; patches = [./2.31.gnutls.patch];
buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl
glib GConf gnome_keyring ]; glib GConf gnome_keyring libgcrypt];
} }