Author: raskin
Date: Thu Apr 14 19:04:39 2011
New Revision: 26846
URL: https://svn.nixos.org/websvn/nix/?rev=26846&sc=1
Log:
Fix build of libsoup 2.31
Modified:
nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix
Modified: nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix Thu Apr 14 15:37:04
2011 (r26845)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix Thu Apr 14 19:04:39
2011 (r26846)
@@ -185,7 +185,8 @@
};
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 GConf gnome_keyring;
};
Modified: nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix Thu Apr
14 15:37:04 2011 (r26845)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix Thu Apr
14 19:04:39 2011 (r26846)
@@ -1,5 +1,5 @@
{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl,
- glib, GConf, gnome_keyring}:
+ glib, GConf, gnome_keyring, libgcrypt}:
stdenv.mkDerivation {
name = "libsoup-2.31.2";
@@ -9,5 +9,5 @@
};
patches = [./2.31.gnutls.patch];
buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl
- glib GConf gnome_keyring ];
+ glib GConf gnome_keyring libgcrypt];
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
