diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2020-01-04 15:20:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-04 15:20:43 +0000 |
| commit | df3896f6acddb0dad01d70443f9b10f7ff05dc40 (patch) | |
| tree | 062f7acc0e236b7e666d8d794235313800d66121 /pkgs | |
| parent | d38c4638ee9d4a7d19965b247dcaf02e117b7e9d (diff) | |
| parent | b3a3168a95dd1060d029c742f5a44df7a5305561 (diff) | |
| download | nixpkgs-df3896f6acddb0dad01d70443f9b10f7ff05dc40.tar nixpkgs-df3896f6acddb0dad01d70443f9b10f7ff05dc40.tar.gz nixpkgs-df3896f6acddb0dad01d70443f9b10f7ff05dc40.tar.bz2 nixpkgs-df3896f6acddb0dad01d70443f9b10f7ff05dc40.tar.lz nixpkgs-df3896f6acddb0dad01d70443f9b10f7ff05dc40.tar.xz nixpkgs-df3896f6acddb0dad01d70443f9b10f7ff05dc40.tar.zst nixpkgs-df3896f6acddb0dad01d70443f9b10f7ff05dc40.zip | |
Merge pull request #76900 from misuzu/psi-1.4
psi: 0.15 -> 1.4
Diffstat (limited to 'pkgs')
3 files changed, 32 insertions, 21 deletions
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index e895b3cc00d..19438c4d037 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xorgproto, libSM -, libICE, qca2, pkgconfig, which, glib -, libXScrnSaver +{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook +, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine +, libidn, qca2-qt5, libXScrnSaver, hunspell }: - stdenv.mkDerivation rec { - name = "psi-0.15"; - - src = fetchurl { - url = "mirror://sourceforge/psi/${name}.tar.bz2"; - sha256 = "593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6"; + pname = "psi"; + version = "1.4"; + src = fetchFromGitHub { + owner = "psi-im"; + repo = pname; + rev = version; + sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4"; + fetchSubmodules = true; }; - - buildInputs = - [ enchant qt4 zlib sox libX11 xorgproto libSM libICE - qca2 pkgconfig which glib libXScrnSaver - ]; - - NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; - - NIX_LDFLAGS="-lqca"; - + patches = [ + ./fix-cmake-hunspell-1.7.patch + ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = [ + qtbase qtmultimedia qtx11extras qttools qtwebengine + libidn qca2-qt5 libXScrnSaver hunspell + ]; enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Psi, an XMPP (Jabber) client"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch b/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch new file mode 100644 index 00000000000..7d5711a6f2b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch @@ -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( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dae4c81318b..06289972c65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20815,7 +20815,7 @@ in 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 { }; |