about summary refs log tree commit diff
path: root/pkgs/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-08-01 18:27:44 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-08-01 19:47:45 +0200
commitf7e934e74595a0d7524159d6faa1bf168572bb5d (patch)
tree105d318bcbdc797129f153916f08d3fbc997e551 /pkgs/default.nix
parentb3762cc221ff407502ae269c057707902ff9070c (diff)
pkgs/tomahawk: Fix/reorganize build dependencies
This fixes the build for Tomahawk because some of these dependencies
were already refactored in upstream <nixpkgs> and hence we can simply
specify the dependencies directly.

Alongside of this, I've broken out some of the buildInputs into
nativeBuildInputs, so this will stay safe for cross compilation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/default.nix')
-rw-r--r--pkgs/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index fb3fd5bd..2b617c6e 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -28,7 +28,10 @@ let
     show-qr-code = callPackage ./show-qr-code { };
     sidplayfp = callPackage ./sidplayfp { };
     tkabber_urgent_plugin = callPackage ./tkabber-urgent-plugin { };
-    tomahawk = callPackage ./tomahawk { qt5 = pkgs.qt55; };
+    tomahawk = callPackage ./tomahawk {
+      qt5 = pkgs.qt55;
+      boost = pkgs.boost155;
+    };
     twitchstream = callPackage ./twitchstream { };
 
     games = import ./games {