Merge branch 'tomahawk'.

Adds the Tomahawk music player (https://www.tomahawk-player.org/) in
version 0.8.1 and all its required and optional dependencies.

* tomahawk:
  tomahawk: Add new package, version 0.8.1.
  libjreen: Add new package, version 1.2.0.
  websocketpp: Add new package, version 0.4.0.
  lucenepp: Add new package, version 3.0.6.
  qtkeychain: Add new package, version 0.4.0.
  libechonest: Add new package, version 2.3.0.
  quazip: Use qt instead of qt5 for refering to Qt.

1 files changed, 23 insertions, 0 deletions

diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
new file mode 100644
index 00000000000..7d33e95326a
--- /dev/null
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "qtkeychain-${version}";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "frankosterfeld";
+    repo = "qtkeychain";
+    rev = "v${version}";
+    sha256 = "10msaylisbwmgpwd59vr4dfgml75kji8mlfwnwq8yp29jikj5amq";
+  };
+
+  cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=$out/share/qt/translations" ];
+
+  buildInputs = [ cmake qt4 ];
+
+  meta = {
+    description = "Platform-independent Qt API for storing passwords securely";
+    homepage = "https://github.com/frankosterfeld/qtkeychain";
+    license = stdenv.lib.licenses.BSD3;
+  };
+}