qtkeychain: Allow building with Qt 5

So far we don't yet need the Qt 5 build for qtkeychain because the two
packages that depend on it are still using Qt 4. However, the next
upstream version of Tomahawk for example already uses Qt 5, so let's
prepare for that.

Tested building against Tomahawk Git master with qt5.qtkeychain.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2016-09-07 11:36:24 +02:00
parent eeebc13e03
commit 1187b00e58
No known key found for this signature in database
GPG key ID: 1DE8E48E57DB5436
2 changed files with 14 additions and 3 deletions

View file

@ -1,7 +1,12 @@
{ stdenv, fetchFromGitHub, cmake, qt4 }:
{ stdenv, fetchFromGitHub, cmake, qt4 ? null
, withQt5 ? false, qtbase ? null, qttools ? null
}:
assert withQt5 -> qtbase != null;
assert withQt5 -> qttools != null;
stdenv.mkDerivation rec {
name = "qtkeychain-${version}";
name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}";
version = "0.7.0";
src = fetchFromGitHub {
@ -13,7 +18,9 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
buildInputs = [ cmake qt4 ];
nativeBuildInputs = [ cmake ];
buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ];
meta = {
description = "Platform-independent Qt API for storing passwords securely";

View file

@ -9288,6 +9288,10 @@ in
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
qtkeychain = callPackage ../development/libraries/qtkeychain {
withQt5 = true;
};
quazip = callPackage ../development/libraries/quazip {
qt = qtbase;
};