public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #76900 from misuzu/psi-1.4

Browse Source 
psi: 0.15 -> 1.4
This commit is contained in:
Michael Raskin 2020-01-04 15:20:43 +00:00 committed by GitHub
commit df3896f6ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/applications/networking/instant-messengers/psi/default.nix
View File

@ -1,27 +1,26 @@
{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xorgproto, libSM { stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
, libICE, qca2, pkgconfig, which, glib , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
, libXScrnSaver , libidn, qca2-qt5, libXScrnSaver, hunspell
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "psi-0.15"; pname = "psi";
version = "1.4";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/psi/${name}.tar.bz2"; owner = "psi-im";
sha256 = "593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6"; repo = pname;
rev = version;
sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4";
fetchSubmodules = true;
}; };
patches = [
buildInputs = ./fix-cmake-hunspell-1.7.patch
[ enchant qt4 zlib sox libX11 xorgproto libSM libICE ];
qca2 pkgconfig which glib libXScrnSaver nativeBuildInputs = [ cmake wrapQtAppsHook ];
]; buildInputs = [
qtbase qtmultimedia qtx11extras qttools qtwebengine
NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; libidn qca2-qt5 libXScrnSaver hunspell
];
NIX_LDFLAGS="-lqca";
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Psi, an XMPP (Jabber) client"; description = "Psi, an XMPP (Jabber) client";
maintainers = [ maintainers.raskin ]; maintainers = [ maintainers.raskin ];

12
pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/cmake/modules/FindHunspell.cmake b/cmake/modules/FindHunspell.cmake
index a2d180b3..3a5aef3a 100644
--- a/cmake/modules/FindHunspell.cmake
+++ b/cmake/modules/FindHunspell.cmake
@@ -64,6 +64,7 @@ set(HUNSPELL_NAMES
hunspell-1.4
hunspell-1.5
hunspell-1.6
+ hunspell-1.7
libhunspell${d}
)
find_library(

2
pkgs/top-level/all-packages.nix
View File

@ -20815,7 +20815,7 @@ in
ps2client = callPackage ../applications/networking/ps2client { }; ps2client = callPackage ../applications/networking/ps2client { };
psi = callPackage ../applications/networking/instant-messengers/psi { }; psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { }; psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };