psi: 1.4 -> 1.5

remove useless wrapQtAppsHook and stdenv
This commit is contained in:
freezeboy 2020-11-05 19:20:57 +01:00
parent d29feee8b6
commit 97b51ad5a9
2 changed files with 12 additions and 9 deletions

View file

@ -1,30 +1,33 @@
{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook { lib, mkDerivation, fetchFromGitHub, cmake
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
, libidn, qca-qt5, libXScrnSaver, hunspell , libidn, qca-qt5, libXScrnSaver, hunspell
}: }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "psi"; pname = "psi";
version = "1.4"; version = "1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "psi-im"; owner = "psi-im";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4"; sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [ patches = [
./fix-cmake-hunspell-1.7.patch ./fix-cmake-hunspell-1.7.patch
]; ];
nativeBuildInputs = [ cmake wrapQtAppsHook ]; nativeBuildInputs = [ cmake qttools ];
buildInputs = [ buildInputs = [
qtbase qtmultimedia qtx11extras qttools qtwebengine qtbase qtmultimedia qtx11extras qtwebengine
libidn qca-qt5 libXScrnSaver hunspell libidn qca-qt5 libXScrnSaver hunspell
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://psi-im.org";
description = "An XMPP (Jabber) client"; description = "An XMPP (Jabber) client";
maintainers = [ maintainers.raskin ]; maintainers = [ maintainers.raskin ];
license = licenses.gpl2; license = licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -23179,7 +23179,7 @@ in
ps2client = callPackage ../applications/networking/ps2client { }; ps2client = callPackage ../applications/networking/ps2client { };
psi = libsForQt514.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 = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { };