about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers/psi
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-03-31 01:50:47 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-03-31 02:13:06 +0200
commit6a4370f1ba45be5cc78375c2c3b2c2704e9270c1 (patch)
tree83fa8ff84777c059b0cb3f76ffb5c20bbe4a6f86 /pkgs/applications/networking/instant-messengers/psi
parentee7c9bd86a8ab999b5a50f7c184aad4b85cbae2a (diff)
qca2: Update to new upstream version 2.1.0.
This also removes qca2_ossl, because it's now bundled with the main QCA
package and we can now drop all those patches and build system fixes,
because they have switched from autotools to cmake.

Tested against a few builds like PSI and Tomahawk.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/psi')
-rw-r--r--pkgs/applications/networking/instant-messengers/psi/default.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 5750476cc5c11..784bda5e0cd43 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM
-, libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib
+, libICE, qca2, pkgconfig, liboil, speex, callPackage, which, glib
 , libXScrnSaver, scrnsaverproto
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ aspell qt4 zlib sox libX11 xproto libSM libICE
-      qca2 qca2_ossl pkgconfig which glib scrnsaverproto libXScrnSaver
+      qca2 pkgconfig which glib scrnsaverproto libXScrnSaver
     ];
 
   NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
@@ -32,9 +32,6 @@ stdenv.mkDerivation rec {
     PSI_PLUGINS="$out/lib/psi/plugins"
     mkdir -p "$PSI_PLUGINS"
     ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS"
-    PSI_QT_PLUGINS="$out/share/psi"
-    mkdir -p "$PSI_QT_PLUGINS"/crypto
-    ln -s "${qca2_ossl}"/lib/qt4/plugins/crypto/*.so "$PSI_QT_PLUGINS"/crypto
   '';
 
   meta = {