about summary refs log tree commit diff
path: root/pkgs/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-11-11 14:00:00 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-11-11 14:21:30 +0100
commit0c7fa45b45387ade0cfbfb048bf5229d2b28d5e3 (patch)
tree8fcbd56514622f32f2356eaa7262ca8a86a08503 /pkgs/default.nix
parentebac6add8f043b304d7ac30798edc38813cbe489 (diff)
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>
Diffstat (limited to 'pkgs/default.nix')
-rw-r--r--pkgs/default.nix2
1 files changed, 1 insertions, 1 deletions
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 = {