From 5810f0e7edc304a19332eacf2aaec232a00569ed Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 23:29:41 -0600 Subject: tomahawk: Qt 5 infrastructure upgrade --- pkgs/applications/audio/tomahawk/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 32d5f1aa13e5..61cb6b9896e3 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -11,9 +11,7 @@ assert enableXMPP -> libjreen != null; assert enableKDE -> kdelibs != null; assert enableTelepathy -> telepathy_qt != null; -let - quazipQt4 = quazip.override { qt = qt4; }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "tomahawk-${version}"; version = "0.8.4"; @@ -29,7 +27,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon - qca2 qjson qt4 qtkeychain quazipQt4 sparsehash taglib websocketpp + qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp makeWrapper ] ++ stdenv.lib.optional enableXMPP libjreen ++ stdenv.lib.optional enableKDE kdelibs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bf279527ef2..d6131f28c58b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13310,6 +13310,7 @@ let enableXMPP = config.tomahawk.enableXMPP or true; enableKDE = config.tomahawk.enableKDE or false; enableTelepathy = config.tomahawk.enableTelepathy or false; + quazip = qt5.quazip.override { qt = qt4; }; }; torchat = callPackage ../applications/networking/instant-messengers/torchat { -- cgit 1.4.1