summary refs log tree commit diff
path: root/pkgs/applications/audio
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/audio
parentee7c9bd86a8ab999b5a50f7c184aad4b85cbae2a (diff)
downloadnixlib-6a4370f1ba45be5cc78375c2c3b2c2704e9270c1.tar
nixlib-6a4370f1ba45be5cc78375c2c3b2c2704e9270c1.tar.gz
nixlib-6a4370f1ba45be5cc78375c2c3b2c2704e9270c1.tar.bz2
nixlib-6a4370f1ba45be5cc78375c2c3b2c2704e9270c1.tar.lz
nixlib-6a4370f1ba45be5cc78375c2c3b2c2704e9270c1.tar.xz
nixlib-6a4370f1ba45be5cc78375c2c3b2c2704e9270c1.tar.zst
nixlib-6a4370f1ba45be5cc78375c2c3b2c2704e9270c1.zip
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/audio')
-rw-r--r--pkgs/applications/audio/tomahawk/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index eb26e2b66c4d..60e66b9f591e 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest
-, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qca2_ossl, qjson, qt4
+, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4
 , qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper
 
 , enableXMPP      ? true,  libjreen     ? null
@@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
   postInstall = let
     pluginPath = stdenv.lib.concatStringsSep ":" [
       "${phonon_backend_vlc}/lib/kde4/plugins"
-      "${qca2_ossl}/lib/qt4/plugins"
     ];
   in ''
     for i in "$out"/bin/*; do