Author: raskin
Date: Thu Apr 14 11:17:45 2011
New Revision: 26843
URL: https://svn.nixos.org/websvn/nix/?rev=26843&sc=1
Log:
Updating some weird corner-cases affected by gnutls
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Apr 14 11:16:05
2011 (r26842)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Apr 14 11:17:45
2011 (r26843)
@@ -6624,6 +6624,7 @@
gtkspell aspell gettext ncurses avahi dbus dbus_glib lib intltool libidn;
openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null;
gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null;
+ libgcrypt = if (getConfig ["pidgin" "gnutls"] false) then libgcrypt else
null;
GStreamer = gst_all.gstreamer;
inherit (gtkLibs) gtk;
inherit (gnome) startupnotification;
@@ -6854,7 +6855,7 @@
inherit pkgconfig webkit makeWrapper;
inherit (gtkLibs) gtk glib;
inherit (xlibs) libX11 kbproto;
- libsoup = gnome28.libsoup_2_31;
+ libsoup = gnome28.libsoup_2_33;
};
valknut = callPackage ../applications/networking/p2p/valknut {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
