psi-plus: migrate to Qt5.15

remove useless wrapQtAppsHook and stdenv
This commit is contained in:
freezeboy 2020-11-05 19:21:24 +01:00
parent 97b51ad5a9
commit 8296881706
2 changed files with 7 additions and 6 deletions

View file

@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook { mkDerivation, lib, fetchFromGitHub, cmake
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
, libidn, qca-qt5, libsecret, libXScrnSaver, hunspell , libidn, qca-qt5, libsecret, libXScrnSaver, hunspell
, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c , libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "psi-plus"; pname = "psi-plus";
version = "1.4.1473"; version = "1.4.1473";
@ -19,15 +19,16 @@ stdenv.mkDerivation rec {
"-DENABLE_PLUGINS=ON" "-DENABLE_PLUGINS=ON"
]; ];
nativeBuildInputs = [ cmake wrapQtAppsHook ]; nativeBuildInputs = [ cmake qttools ];
buildInputs = [ buildInputs = [
qtbase qtmultimedia qtx11extras qttools qtwebengine qtbase qtmultimedia qtx11extras qtwebengine
libidn qca-qt5 libsecret libXScrnSaver hunspell libidn qca-qt5 libsecret libXScrnSaver hunspell
libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
]; ];
meta = with stdenv.lib; { meta = with lib; {
homepage = "https://sourceforge.net/projects/psiplus/";
description = "XMPP (Jabber) client"; description = "XMPP (Jabber) client";
maintainers = with maintainers; [ orivej misuzu ]; maintainers = with maintainers; [ orivej misuzu ];
license = licenses.gpl2; license = licenses.gpl2;

View file

@ -23181,7 +23181,7 @@ in
psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
psi-plus = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { }; psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };
psol = callPackage ../development/libraries/psol { }; psol = callPackage ../development/libraries/psol { };