From 48bd3ae648688284d130448a252674a8b6ee27a7 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 9 Mar 2017 01:33:32 +0000 Subject: psi-plus: switch to qt5 --- .../networking/instant-messengers/psi-plus/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/networking/instant-messengers/psi-plus') diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 281f86a5741a5..1693c4cdc5559 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , which, pkgconfig -, qt4, libidn, qca2, libXScrnSaver, enchant +, qt5, libidn, qca2-qt5, libXScrnSaver, enchant }: stdenv.mkDerivation rec { @@ -27,11 +27,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which pkgconfig ]; - buildInputs = [ qt4 libidn qca2 libXScrnSaver enchant ]; - - NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; - - NIX_LDFLAGS="-lqca"; + buildInputs = [ + qt5.qtbase qt5.qtmultimedia qt5.qtx11extras + libidn qca2-qt5 libXScrnSaver enchant + ]; enableParallelBuilding = true; -- cgit 1.4.1