about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-03-31 14:42:11 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-03-31 14:42:11 +0200
commitd23830359e708406c2f688db3dd9444e26d933dd (patch)
tree3e5d523bc0db124fab4a178198de8d819a00ba44 /pkgs
parent72fa590e03e91fea4265ca7bd86c3ccfa25a9437 (diff)
tomahawk: Replace attica by the Qt 5 version.
Using the attica version from the KDE frameworks attribute set.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tomahawk/default.nix10
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix
index 91bdd037..9bf97a32 100644
--- a/pkgs/tomahawk/default.nix
+++ b/pkgs/tomahawk/default.nix
@@ -24,12 +24,6 @@ let
     cmakeFlags = (drv.cmakeFlags or []) ++ [ "-DBUILD_WITH_QT4=OFF" ];
   });
 
-  atticaQT5 = overrideDerivation (useQT5 attica) (drv: {
-    buildInputs = (drv.buildInputs or []) ++ [
-      kf5_latest.extra-cmake-modules
-    ];
-  });
-
   vlc = vlc_qt5.override {
     ffmpeg = ffmpeg_2.override {
       v4l_utils = v4l_utils.override { withQt4 = false; };
@@ -53,8 +47,8 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = (map useQT5 [ qca2 liblastfm quazip qtkeychain qjson ]) ++ [
-    libechonestQT5 atticaQT5 cmake pkgconfig boost gnutls lucenepp vlc
-    qt54.base sparsehash taglib websocketpp makeWrapper
+    libechonestQT5 kf5_latest.attica cmake pkgconfig boost gnutls lucenepp
+    vlc qt54.base sparsehash taglib websocketpp makeWrapper
   ] ++ stdenv.lib.optional enableXMPP      (useQT5 libjreen)
     ++ stdenv.lib.optional enableKDE       (useQT5 kdelibs)
     ++ stdenv.lib.optional enableTelepathy (useQT5 telepathy_qt);