From f812e39fb46d1b4ec96391efc3a52e46bef4f6ef Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 7 Mar 2017 13:21:38 +0000
Subject: [PATCH 1/3] psi-plus: init at 0.16.575.639

---
 .../instant-messengers/psi-plus/default.nix   | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/psi-plus/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
new file mode 100644
index 00000000000..281f86a5741
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub
+, which, pkgconfig
+, qt4, libidn, qca2, libXScrnSaver, enchant
+}:
+
+stdenv.mkDerivation rec {
+  name = "psi-plus-${version}";
+  version = "0.16.575.639";
+
+  src = fetchFromGitHub {
+    owner = "psi-plus";
+    repo = "psi-plus-snapshots";
+    rev = "${version}";
+    sha256 = "0mn24y3y4qybw81rjy0hr46y7y96dvwdl6kk61kizwj32z1in8cg";
+  };
+
+  resources = fetchFromGitHub {
+    owner = "psi-plus";
+    repo = "resources";
+    rev = "8f5038380e1be884b04b5a1ad3cc3385e793f668";
+    sha256 = "1b8a2aixg966fzjwp9hz51rc31imyvpx014mp2fsm47k8na4470d";
+  };
+
+  postUnpack = ''
+    cp -a "${resources}/iconsets" "$sourceRoot"
+  '';
+
+  nativeBuildInputs = [ which pkgconfig ];
+
+  buildInputs = [ qt4 libidn qca2 libXScrnSaver enchant ];
+
+  NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
+
+  NIX_LDFLAGS="-lqca";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "XMPP (Jabber) client";
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21f292dca76..46a72a0311b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15031,6 +15031,8 @@ with pkgs;
 
   psi = kde4.callPackage ../applications/networking/instant-messengers/psi { };
 
+  psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { };
+
   psol = callPackage ../development/libraries/psol/default.nix { };
 
   pstree = callPackage ../applications/misc/pstree { };

From 48bd3ae648688284d130448a252674a8b6ee27a7 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 9 Mar 2017 01:33:32 +0000
Subject: [PATCH 2/3] psi-plus: switch to qt5

---
 .../instant-messengers/psi-plus/default.nix           | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 281f86a5741..1693c4cdc55 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , which, pkgconfig
-, qt4, libidn, qca2, libXScrnSaver, enchant
+, qt5, libidn, qca2-qt5, libXScrnSaver, enchant
 }:
 
 stdenv.mkDerivation rec {
@@ -27,11 +27,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ which pkgconfig ];
 
-  buildInputs = [ qt4 libidn qca2 libXScrnSaver enchant ];
-
-  NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
-
-  NIX_LDFLAGS="-lqca";
+  buildInputs = [
+    qt5.qtbase qt5.qtmultimedia qt5.qtx11extras
+    libidn qca2-qt5 libXScrnSaver enchant
+  ];
 
   enableParallelBuilding = true;
 

From cea6a24bfcfc4c35f993aaabad980e32023e0166 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 9 Mar 2017 02:17:40 +0000
Subject: [PATCH 3/3] psi-plus: enable plugins

---
 .../instant-messengers/psi-plus/default.nix     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 1693c4cdc55..c4d13ac7643 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub
-, which, pkgconfig
-, qt5, libidn, qca2-qt5, libXScrnSaver, enchant
+{ stdenv, fetchFromGitHub, cmake
+, qt5, libidn, qca2-qt5, libXScrnSaver, hunspell
+, libgcrypt, libotr, html-tidy, libgpgerror
 }:
 
 stdenv.mkDerivation rec {
@@ -25,11 +25,16 @@ stdenv.mkDerivation rec {
     cp -a "${resources}/iconsets" "$sourceRoot"
   '';
 
-  nativeBuildInputs = [ which pkgconfig ];
+  cmakeFlags = [
+    "-DENABLE_PLUGINS=ON"
+  ];
+
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [
-    qt5.qtbase qt5.qtmultimedia qt5.qtx11extras
-    libidn qca2-qt5 libXScrnSaver enchant
+    qt5.qtbase qt5.qtmultimedia qt5.qtx11extras qt5.qttools qt5.qtwebkit
+    libidn qca2-qt5 libXScrnSaver hunspell
+    libgcrypt libotr html-tidy libgpgerror
   ];
 
   enableParallelBuilding = true;