From 0c7fa45b45387ade0cfbfb048bf5229d2b28d5e3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 11 Nov 2015 14:00:00 +0100
Subject: pkgs/tomahawk: Switch to using Qt 5.5.

Fixes the following build error:

https://headcounter.org/hydra/build/764598

Of course, we could have fixed this by overriding Lucene++, but we want
to stay on the latest Qt version for Tomahawk anyway.

We no longer need qcaQT5, because that has been packaged upstream.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/default.nix')

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 0530c17c..41598357 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -18,7 +18,7 @@ let
     pvolctrl = callPackage ./pvolctrl { };
     sidplayfp = callPackage ./sidplayfp { };
     tkabber_urgent_plugin = callPackage ./tkabber-urgent-plugin { };
-    tomahawk = callPackage ./tomahawk { };
+    tomahawk = callPackage ./tomahawk { qt5 = pkgs.qt55; };
     twitchstream = callPackage ./twitchstream { };
 
     kernelPatches = {
-- 
cgit 1.4.1