about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-12-21 08:38:22 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-12-21 08:41:18 +0100
commit50ad4de5dea2695e36558b1da4410ca61b189a63 (patch)
tree1a39f37f9c903e771e35e2dae1a4ec7b62658959 /pkgs
parent5db93bdbf802b16f98230411f9a7ea9858dd13c5 (diff)
pkgs/tomahawk: Fix quazip evaluation error
In NixOS/nixpkgs@1d33148, quazip moved from a top-level attribute down
to a sub-attribute of qt5LibsFun, which in turn gets exposed via the
"qt5" top-level attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tomahawk/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix
index d3330bff..d8d9cbc6 100644
--- a/pkgs/tomahawk/default.nix
+++ b/pkgs/tomahawk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, attica, boost, gnutls
-, libechonest, liblastfm, lucenepp, vlc_qt5, qca-qt5, qt5, qtkeychain, quazip
+, libechonest, liblastfm, lucenepp, vlc_qt5, qca-qt5, qt5, qtkeychain
 , kde5_latest, sparsehash, taglib, websocketpp, makeWrapper, ffmpeg_2, v4l_utils
 
 , enableXMPP      ? true,  libjreen     ? null
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
     "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib"
   ];
 
-  buildInputs = (map useQT5 [ liblastfm quazip ]) ++ [
+  buildInputs = (map useQT5 [ liblastfm qt5.quazip ]) ++ [
     qca-qt5 qtkeychainQT5 libechonestQT5 kde5_latest.attica cmake pkgconfig
     kde5_latest.extra-cmake-modules boost gnutls lucenepp vlc qt5.qtbase
     qt5.qtsvg qt5.qttools qt5.qtwebkit qt5.qtx11extras sparsehash taglib