Add otr support to kopete

svn path=/nixpkgs/trunk/; revision=21770
This commit is contained in:
Yury G. Kudryashov 2010-05-13 22:14:16 +00:00
parent 43106b4d04
commit dd6d459130
2 changed files with 3 additions and 3 deletions

View File

@ -146,7 +146,7 @@ pkgs.recurseIntoAttrs (rec {
kdenetwork = import ./network { kdenetwork = import ./network {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib; inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib;
inherit (pkgs) libidn libvncserver libmsn giflib gpgme boost libv4l; inherit (pkgs) libidn libvncserver libmsn giflib gpgme boost libv4l libotr;
inherit (pkgs.xlibs) libXi libXtst libXdamage libXxf86vm; inherit (pkgs.xlibs) libXi libXtst libXdamage libXxf86vm;
inherit kdelibs kdepimlibs; inherit kdelibs kdepimlibs;
inherit automoc4 phonon qca2 soprano qimageblitz strigi; inherit automoc4 phonon qca2 soprano qimageblitz strigi;

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn { stdenv, fetchurl, lib, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
, libvncserver, libmsn, giflib, gpgme, boost, libv4l , libvncserver, libmsn, giflib, gpgme, boost, libv4l, libotr
, libXi, libXtst, libXdamage, libXxf86vm , libXi, libXtst, libXdamage, libXxf86vm
, kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}: , kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}:
@ -11,7 +11,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
libvncserver libmsn giflib gpgme boost stdenv.gcc.libc libv4l libvncserver libmsn giflib gpgme boost stdenv.gcc.libc libv4l
libXi libXtst libXdamage libXxf86vm libotr libXi libXtst libXdamage libXxf86vm
kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ]; kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ];
patches = [ ./kget-cve.patch ]; patches = [ ./kget-cve.patch ];
meta = { meta = {