diff options
| -rw-r--r-- | pkgs/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tomahawk/default.nix | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index 91894423..0b2c9b13 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -32,7 +32,6 @@ let sidplayfp = callPackage ./sidplayfp { }; tkabber_urgent_plugin = callPackage ./tkabber-urgent-plugin { }; tomahawk = callPackage ./tomahawk { - qt5 = pkgs.qt55; boost = pkgs.boost155; }; twitchstream = callPackage ./twitchstream { }; diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix index 8b39fd77..26f742a1 100644 --- a/pkgs/tomahawk/default.nix +++ b/pkgs/tomahawk/default.nix @@ -45,6 +45,12 @@ let }; }; + jreenPatched = overrideDerivation (useQT5 libjreen) (drv: { + postPatch = (drv.postPatch or "") + '' + sed -i -e 's/QMetaTypeId/QMap/g' src/stanzaextension.h + ''; + }); + in stdenv.mkDerivation rec { name = "tomahawk-${version}"; version = "0.9.0-git"; @@ -67,7 +73,7 @@ in stdenv.mkDerivation rec { attica ecm qca-qt5 qtbase qtkeychain qtsvg qttools qtwebkit qtx11extras ]) ++ map useQT5 [ liblastfm qt5.quazip ] ++ [ boost gnutls lucenepp sparsehash taglib vlc websocketpp libechonestQT5 - ] ++ stdenv.lib.optional enableXMPP (useQT5 libjreen) + ] ++ stdenv.lib.optional enableXMPP jreenPatched ++ stdenv.lib.optional enableKDE (useQT5 kdelibs) ++ stdenv.lib.optional enableTelepathy (useQT5 telepathy_qt); |