From 1187b00e5872c8b65919158f2f908efb29117649 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 7 Sep 2016 11:36:24 +0200 Subject: [PATCH] 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 --- pkgs/development/libraries/qtkeychain/default.nix | 13 ++++++++++--- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 18f53d458348..f0e7f958e402 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86fa34a3b430..23c071673c83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };