diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-13 22:14:16 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-13 22:14:16 +0000 |
| commit | dd6d459130a0147a19d06ccaf9a049847b66a29e (patch) | |
| tree | 4a78e0149075391f99b5444c68bc9ef48790d44b | |
| parent | 43106b4d045621bbf2cd5b52dbe68e65a22a6129 (diff) | |
| download | nixlib-dd6d459130a0147a19d06ccaf9a049847b66a29e.tar nixlib-dd6d459130a0147a19d06ccaf9a049847b66a29e.tar.gz nixlib-dd6d459130a0147a19d06ccaf9a049847b66a29e.tar.bz2 nixlib-dd6d459130a0147a19d06ccaf9a049847b66a29e.tar.lz nixlib-dd6d459130a0147a19d06ccaf9a049847b66a29e.tar.xz nixlib-dd6d459130a0147a19d06ccaf9a049847b66a29e.tar.zst nixlib-dd6d459130a0147a19d06ccaf9a049847b66a29e.zip | |
Add otr support to kopete
svn path=/nixpkgs/trunk/; revision=21770
| -rw-r--r-- | pkgs/desktops/kde-4.4/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.4/network/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 562813f23ca1..3982301c8d13 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -146,7 +146,7 @@ pkgs.recurseIntoAttrs (rec { kdenetwork = import ./network { 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 kdelibs kdepimlibs; inherit automoc4 phonon qca2 soprano qimageblitz strigi; diff --git a/pkgs/desktops/kde-4.4/network/default.nix b/pkgs/desktops/kde-4.4/network/default.nix index b91b97dfdf84..382119b68e01 100644 --- a/pkgs/desktops/kde-4.4/network/default.nix +++ b/pkgs/desktops/kde-4.4/network/default.nix @@ -1,5 +1,5 @@ { 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 , 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 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 ]; patches = [ ./kget-cve.patch ]; meta = { |