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

pidgin 2.9.0

Browse Source 
svn path=/nixpkgs/trunk/; revision=28425
This commit is contained in:
David Guibert
2011-08-09 12:35:55 +00:00
parent cd3fda3def
commit 7de614fdf3
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/instant-messengers/pidgin/default.nix
+4 -5
View File
@@ -18,14 +18,13 @@
, openssl ? null , openssl ? null
, gnutls ? null , gnutls ? null
, libgcrypt ? null , libgcrypt ? null
, voice ? null
} : } :
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pidgin-2.7.9"; name = "pidgin-2.9.0";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/pidgin/pidgin-2.7.9.tar.bz2; url = mirror://sourceforge/pidgin/pidgin-2.9.0.tar.bz2;
sha256 = "17p1lcdxh241nsaz8xxbr8l5r7a0v5qg500cj0llww56k7qxf8lp"; sha256 = "1mygaap7cbak9n9zm4wshxnvb27a68w633d712vy2knr8z78xvi8";
}; };
inherit nss ncurses; inherit nss ncurses;
@@ -47,7 +46,7 @@ stdenv.mkDerivation {
pkgconfig gtk perl perlXMLParser gettext pkgconfig gtk perl perlXMLParser gettext
]; ];
patches = [./pidgin-makefile.patch]; patches = [./pidgin-makefile.patch ];
configureFlags="--with-nspr-includes=${nspr}/include/nspr --with-nspr-libs=${nspr}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include --disable-meanwhile --disable-nm --disable-tcl" configureFlags="--with-nspr-includes=${nspr}/include/nspr --with-nspr-libs=${nspr}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include --disable-meanwhile --disable-nm --disable-tcl"
+ (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no") + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no")
pkgs/top-level/all-packages.nix
+1 -5
View File
@@ -6968,16 +6968,12 @@ let
pdftk = callPackage ../tools/typesetting/pdftk { }; pdftk = callPackage ../tools/typesetting/pdftk { };
pidgin = import ../applications/networking/instant-messengers/pidgin { pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr farsight2 python
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; libgcrypt = if (getConfig ["pidgin" "gnutls"] false) then libgcrypt else null;
GStreamer = gst_all.gstreamer; GStreamer = gst_all.gstreamer;
inherit (gtkLibs) gtk;
inherit (gnome) startupnotification; inherit (gnome) startupnotification;
inherit (xlibs) libXScrnSaver;
inherit (gst_all) gstPluginsBase; inherit (gst_all) gstPluginsBase;
}; };