diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-12-17 11:08:56 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-12-17 11:08:56 +0100 |
| commit | 6184dfd33d07c7c7abf93adb2174197dbdfabb11 (patch) | |
| tree | 243061981f90ce1bbaa4777a3112c4a53755c879 /pkgs/tomahawk | |
| parent | 245e956157be20a02a513fa11cc2be0cdb879c81 (diff) | |
pkgs/tomahawk: Fix evaluation
Since NixOS/nixpkgs@0a81a0d, kf5_latest expects an attribute set as an argument (in this case the attribute set/scope for qt55libs). This however is passed by kde5_latest, so let's switch to use that attribute set instead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/tomahawk')
| -rw-r--r-- | pkgs/tomahawk/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix index db13733f..d3330bff 100644 --- a/pkgs/tomahawk/default.nix +++ b/pkgs/tomahawk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, attica, boost, gnutls , libechonest, liblastfm, lucenepp, vlc_qt5, qca-qt5, qt5, qtkeychain, quazip -, kf5_latest, sparsehash, taglib, websocketpp, makeWrapper, ffmpeg_2, v4l_utils +, kde5_latest, sparsehash, taglib, websocketpp, makeWrapper, ffmpeg_2, v4l_utils , enableXMPP ? true, libjreen ? null , enableKDE ? false, kdelibs ? null @@ -69,8 +69,8 @@ in stdenv.mkDerivation rec { ]; buildInputs = (map useQT5 [ liblastfm quazip ]) ++ [ - qca-qt5 qtkeychainQT5 libechonestQT5 kf5_latest.attica cmake pkgconfig - kf5_latest.extra-cmake-modules boost gnutls lucenepp vlc qt5.qtbase + 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 websocketpp makeWrapper ] ++ stdenv.lib.optional enableXMPP (useQT5 libjreen) |