alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

add voice and video

Browse source 
svn path=/nixpkgs/trunk/; revision=19136
This commit is contained in:
Armijn Hemel 2009-12-27 16:49:08 +00:00
parent 88af9b98d1
commit d993cf0f5f
3 changed files with 70 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View file

@ -11,12 +11,13 @@
* - doxygen
*/
{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell,
GStreamer, startupnotification, gettext,
perl, perlXMLParser, libxml2, nss, nspr,
GStreamer, gstPluginsBase, startupnotification, gettext,
perl, perlXMLParser, libxml2, nss, nspr, farsight2,
libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
, lib
, openssl ? null
, gnutls ? null
, voice ? null
} :
stdenv.mkDerivation {
@ -29,12 +30,12 @@ stdenv.mkDerivation {
inherit nss ncurses;
buildInputs = [
gtkspell aspell
GStreamer startupnotification
GStreamer gstPluginsBase startupnotification
libxml2]
++ (lib.optional (openssl != null) openssl)
++ (lib.optional (gnutls != null) gnutls)
++
[nss nspr
[nss nspr farsight2
libXScrnSaver ncurses
avahi dbus dbus_glib intltool libidn
]
@ -44,7 +45,9 @@ stdenv.mkDerivation {
pkgconfig gtk perl perlXMLParser gettext
];
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 --disable-vv"
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")
;
meta = {

60
pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch Normal file
View file

@ -0,0 +1,60 @@
diff -ru pidgin-2.6.4/pidgin/Makefile.am pidgin-2.6.4.new/pidgin/Makefile.am
--- pidgin-2.6.4/pidgin/Makefile.am 2009-11-30 04:13:54.000000000 +0100
+++ pidgin-2.6.4.new/pidgin/Makefile.am 2009-12-27 17:30:58.000000000 +0100
@@ -200,6 +200,7 @@
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(GSTREAMER_LIBS) \
+ $(GSTINTERFACES_LIBS) \
$(XSS_LIBS) \
$(SM_LIBS) \
$(INTLLIBS) \
@@ -224,6 +225,7 @@
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
$(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS) \
$(DBUS_CFLAGS) \
diff -ru pidgin-2.6.4/pidgin/Makefile.in pidgin-2.6.4.new/pidgin/Makefile.in
--- pidgin-2.6.4/pidgin/Makefile.in 2009-11-30 05:12:21.000000000 +0100
+++ pidgin-2.6.4.new/pidgin/Makefile.in 2009-12-27 17:30:36.000000000 +0100
@@ -645,6 +645,7 @@
@ENABLE_GTK_TRUE@ $(GLIB_LIBS) \
@ENABLE_GTK_TRUE@ $(DBUS_LIBS) \
@ENABLE_GTK_TRUE@ $(GSTREAMER_LIBS) \
+@ENABLE_GTK_TRUE@ $(GSTINTERFACES_LIBS) \
@ENABLE_GTK_TRUE@ $(XSS_LIBS) \
@ENABLE_GTK_TRUE@ $(SM_LIBS) \
@ENABLE_GTK_TRUE@ $(INTLLIBS) \
@@ -666,6 +667,7 @@
@ENABLE_GTK_TRUE@ -I$(top_srcdir) \
@ENABLE_GTK_TRUE@ $(GLIB_CFLAGS) \
@ENABLE_GTK_TRUE@ $(GSTREAMER_CFLAGS) \
+@ENABLE_GTK_TRUE@ $(GSTINTERFACES_CFLAGS) \
@ENABLE_GTK_TRUE@ $(DEBUG_CFLAGS) \
@ENABLE_GTK_TRUE@ $(GTK_CFLAGS) \
@ENABLE_GTK_TRUE@ $(DBUS_CFLAGS) \
diff -ru pidgin-2.6.4/pidgin/plugins/Makefile.am pidgin-2.6.4.new/pidgin/plugins/Makefile.am
--- pidgin-2.6.4/pidgin/plugins/Makefile.am 2009-11-30 04:13:57.000000000 +0100
+++ pidgin-2.6.4.new/pidgin/plugins/Makefile.am 2009-12-27 16:58:50.000000000 +0100
@@ -137,6 +137,7 @@
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS) \
$(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \
$(PLUGIN_CFLAGS)
#
diff -ru pidgin-2.6.4/pidgin/plugins/Makefile.in pidgin-2.6.4.new/pidgin/plugins/Makefile.in
--- pidgin-2.6.4/pidgin/plugins/Makefile.in 2009-11-30 05:12:22.000000000 +0100
+++ pidgin-2.6.4.new/pidgin/plugins/Makefile.in 2009-12-27 16:59:13.000000000 +0100
@@ -644,6 +644,7 @@
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS) \
$(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \
$(PLUGIN_CFLAGS)

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

@ -7283,7 +7283,7 @@ let
};
pidgin = import ../applications/networking/instant-messengers/pidgin {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr farsight2
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;
@ -7291,6 +7291,7 @@ let
inherit (gtkLibs) gtk;
inherit (gnome) startupnotification;
inherit (xlibs) libXScrnSaver;
inherit (gst_all) gstPluginsBase;
};
pidginlatex = composedArgsAndFun (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex) {