diff options
author | Armijn Hemel <armijn@gpl-violations.org> | 2009-12-27 16:49:08 +0000 |
---|---|---|
committer | Armijn Hemel <armijn@gpl-violations.org> | 2009-12-27 16:49:08 +0000 |
commit | d993cf0f5f8bb1ace728fed24ecc8d5c7aa308d6 (patch) | |
tree | 858ebc61fe25c4fbc2b9df76bcbdc838a4469508 /pkgs/applications/networking/instant-messengers/pidgin | |
parent | 88af9b98d153d52178a33730bfae08c8851a680a (diff) |
add voice and video
svn path=/nixpkgs/trunk/; revision=19136
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/pidgin')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch | 60 |
2 files changed, 68 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index cda64d2180d3f..99461a97762f9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -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 = { diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch new file mode 100644 index 0000000000000..2812496effaf6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch @@ -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) + + |