From bac6b69e182ab2f497216e7e29d27a3971a4ee6a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 14 Apr 2011 19:04:39 +0000 Subject: [PATCH] Fix build of libsoup 2.31 svn path=/nixpkgs/trunk/; revision=26846 --- pkgs/desktops/gnome-2.28/default.nix | 3 ++- pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 4dc60bf9021..a1838cecb8a 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -185,7 +185,8 @@ pkgs.makeOverridable }; 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; }; diff --git a/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix index 6ddc76e0f4b..a5bbde825da 100644 --- a/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix +++ b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix @@ -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 @@ stdenv.mkDerivation { }; patches = [./2.31.gnutls.patch]; buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl - glib GConf gnome_keyring ]; + glib GConf gnome_keyring libgcrypt]; }