dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Updating some weird corner-cases affected by gnutls

Browse Source 
svn path=/nixpkgs/trunk/; revision=26843
This commit is contained in:
Michael Raskin 2011-04-14 11:17:45 +00:00
parent bf1e3d3f87
commit a6935566ad
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/top-level/all-packages.nix
View File

@ -6624,6 +6624,7 @@ let
gtkspell aspell gettext ncurses avahi dbus dbus_glib lib intltool libidn; gtkspell aspell gettext ncurses avahi dbus dbus_glib lib intltool libidn;
openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null; openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null;
gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls 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; GStreamer = gst_all.gstreamer;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) startupnotification; inherit (gnome) startupnotification;
@ -6854,7 +6855,7 @@ let
inherit pkgconfig webkit makeWrapper; inherit pkgconfig webkit makeWrapper;
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
inherit (xlibs) libX11 kbproto; inherit (xlibs) libX11 kbproto;
libsoup = gnome28.libsoup_2_31; libsoup = gnome28.libsoup_2_33;
}; };
valknut = callPackage ../applications/networking/p2p/valknut { valknut = callPackage ../applications/networking/p2p/valknut {