Author: guibert
Date: Tue Aug 9 12:35:55 2011
New Revision: 28425
URL: https://svn.nixos.org/websvn/nix/?rev=28425&sc=1
Log:
pidgin 2.9.0
Modified:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/pidgin/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/pidgin/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/pidgin/default.nix
Tue Aug 9 12:28:49 2011 (r28424)
+++
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/pidgin/default.nix
Tue Aug 9 12:35:55 2011 (r28425)
@@ -18,14 +18,13 @@
, openssl ? null
, gnutls ? null
, libgcrypt ? null
- , voice ? null
} :
stdenv.mkDerivation {
- name = "pidgin-2.7.9";
+ name = "pidgin-2.9.0";
src = fetchurl {
- url = mirror://sourceforge/pidgin/pidgin-2.7.9.tar.bz2;
- sha256 = "17p1lcdxh241nsaz8xxbr8l5r7a0v5qg500cj0llww56k7qxf8lp";
+ url = mirror://sourceforge/pidgin/pidgin-2.9.0.tar.bz2;
+ sha256 = "1mygaap7cbak9n9zm4wshxnvb27a68w633d712vy2knr8z78xvi8";
};
inherit nss ncurses;
@@ -47,7 +46,7 @@
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"
+ (lib.optionalString (gnutls != null) " --enable-gnutls=yes
--enable-nss=no")
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 9 12:28:49
2011 (r28424)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 9 12:35:55
2011 (r28425)
@@ -6968,16 +6968,12 @@
pdftk = callPackage ../tools/typesetting/pdftk { };
- pidgin = import ../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;
+ pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
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;
- inherit (xlibs) libXScrnSaver;
inherit (gst_all) gstPluginsBase;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
