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

Fixed pigdin compilation by adding nspr as buildinput

Browse source 
svn path=/nixpkgs/trunk/; revision=16267
This commit is contained in:
Sander van der Burg 2009-07-09 09:50:51 +00:00
parent 506e86d2ea
commit 8c806707f3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@
*/
{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell,
GStreamer, startupnotification, gettext,
perl, perlXMLParser, libxml2, nss,
perl, perlXMLParser, libxml2, nss, nspr,
libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool
, lib
, openssl ? null
@ -34,7 +34,7 @@ stdenv.mkDerivation {
++ (lib.optional (openssl != null) openssl)
++ (lib.optional (gnutls != null) gnutls)
++
[nss
[nss nspr
libXScrnSaver ncurses
avahi dbus dbus_glib intltool
]
@ -44,7 +44,7 @@ stdenv.mkDerivation {
pkgconfig gtk perl perlXMLParser gettext
];
configureFlags="--with-nspr-includes=${nss}/include/nspr --with-nspr-libs=${nss}/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")
;
meta = {

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

@ -6795,7 +6795,7 @@ let
};
pidgin = import ../applications/networking/instant-messengers/pidgin {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr
gtkspell aspell gettext ncurses avahi dbus dbus_glib lib intltool;
openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null;
gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null;