diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-03-31 02:16:39 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-03-31 02:16:39 +0200 |
| commit | aa39a7ea6ebf36ba41af572f03ef5ef41aa8b35b (patch) | |
| tree | fcedcc5960055814253873b3c471c245e198a9cb /pkgs/tomahawk | |
| parent | 9e30ffeff2a0be999ccb0e4400f8b51fba9e5512 (diff) | |
tomahawk: Remove dependency on qca2_ossl.
As of NixOS/nixpkgs@ee7c9bd this is no longer needed, as the new upstream version of QCA2 includes the plugin already. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/tomahawk')
| -rw-r--r-- | pkgs/tomahawk/default.nix | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix index 16219e3b..d495a009 100644 --- a/pkgs/tomahawk/default.nix +++ b/pkgs/tomahawk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, vlc, qca2, qca2_ossl, qjson, qt4, qtkeychain, quazip +, liblastfm, lucenepp, vlc, qca2, qjson, qt5, qtkeychain, quazip, kf5_latest , sparsehash, taglib, websocketpp, makeWrapper , enableXMPP ? true, libjreen ? null @@ -37,16 +37,6 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional enableKDE kdelibs ++ stdenv.lib.optional enableTelepathy telepathy_qt; - postInstall = let - pluginPath = stdenv.lib.concatStringsSep ":" [ - "${qca2_ossl}/lib/qt4/plugins" - ]; - in '' - for i in "$out"/bin/*; do - wrapProgram "$i" --prefix QT_PLUGIN_PATH : "${pluginPath}" - done - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { |