psi-plus: 1.4.904 -> 1.4.984

Also fix 'ld: cannot find -lsecret-1 error' on build and crash with 'This application failed to start because no Qt platform plugin could be initialized' error on startup.
This commit is contained in:
misuzu 2020-01-13 13:59:40 +02:00
parent d9319e8e87
commit 9d28b0b95e

View File

@ -1,25 +1,25 @@
{ stdenv, fetchFromGitHub, cmake { stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
, libidn, qca2-qt5, qtkeychain, libXScrnSaver, hunspell , libidn, qca2-qt5, libsecret, libXScrnSaver, hunspell
, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c , libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "psi-plus"; pname = "psi-plus";
version = "1.4.904"; version = "1.4.984";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "psi-plus"; owner = "psi-plus";
repo = "psi-plus-snapshots"; repo = "psi-plus-snapshots";
rev = version; rev = version;
sha256 = "1bs7yk3qp91sm8nb9gna8vm59381afn1wfs7aii9yi29bhx6fw9h"; sha256 = "1nii2nfi37i6mn79xmygscmm8ax75ky244wxkzlga0ya8i8wfjh7";
}; };
resources = fetchFromGitHub { resources = fetchFromGitHub {
owner = "psi-plus"; owner = "psi-plus";
repo = "resources"; repo = "resources";
rev = "182c92ca0bcc055579d8c91bccba9efe157e77a9"; rev = "2f1c12564f7506bf902a26040fdb47ead4df6b73";
sha256 = "06k7q63cxpifpzjnlw1snclkr2mwf9fh71cgfd40n7jgzswzwhpb"; sha256 = "1dgm9k052fq7f2bpx13kchg7sxb227dkn115lyspzvhnhprnypz2";
}; };
postUnpack = '' postUnpack = ''
@ -30,11 +30,11 @@ stdenv.mkDerivation rec {
"-DENABLE_PLUGINS=ON" "-DENABLE_PLUGINS=ON"
]; ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [ buildInputs = [
qtbase qtmultimedia qtx11extras qttools qtwebengine qtbase qtmultimedia qtx11extras qttools qtwebengine
libidn qca2-qt5 qtkeychain libXScrnSaver hunspell libidn qca2-qt5 libsecret libXScrnSaver hunspell
libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
]; ];
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "XMPP (Jabber) client"; description = "XMPP (Jabber) client";
maintainers = with maintainers; [ orivej ]; maintainers = with maintainers; [ orivej misuzu ];
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
}; };