Updating psi to a working version with ssl, using kde42 qca.

svn path=/nixpkgs/trunk/; revision=15842

pkgs/applications/networking/instant-messengers/psi/0.11.nix

@@ -1,20 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = ftp://ftp.ru.debian.org/debian/pool/main/p/psi/psi_0.11.orig.tar.gz;
-    sha256 = "1rgjahngari4pwhi0zz9mricaaqxkk8ry8w6s1vgsq3zwa2l5x57";
-  };
-
-  buildInputs = [aspell qt zlib sox openssl libX11 xproto 
-    libSM libICE];
-  configureFlags = [" --with-zlib-inc=${zlib}/include "
-    " --with-openssl-inc=${openssl}/include "
-  ];
-
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "psi-" + version;
-  meta = {
-    description = "Psi, an XMPP (Jabber) client";
-  };
-}

pkgs/applications/networking/instant-messengers/psi/0.12.1.nix

@@ -0,0 +1,19 @@
+args : with args;
+stdenv.mkDerivation rec {
+  src = fetchurl {
+    url = mirror://sourceforge/psi/psi-0.12.1.tar.bz2;
+    sha256 = "0zi71fcia9amcasa6zrvfyghdpqa821iv2rkj53bq5dyvfm2y0m8";
+  };
+
+  buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE qca2];
+
+  NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
+
+  configureFlags = [ " --with-zlib-inc=${zlib}/include "
+    " --disable-bundled-qca" ];
+
+  name = "psi-" + version;
+  meta = {
+    description = "Psi, an XMPP (Jabber) client";
+  };
+}

pkgs/applications/networking/instant-messengers/psi/0.12.nix

@@ -1,20 +0,0 @@
-args : with args;
-rec {
-  src = fetchurl {
-    url = mirror://sourceforge/psi/psi-0.12.tar.gz;
-    sha256 = "6afbb3b017009bf4d8d275ec1481e92831b0618ecb58f1372cd9189140a316af";
-  };
-
-  buildInputs = [aspell qt zlib sox openssl libX11 xproto
-    libSM libICE];
-  configureFlags = [" --with-zlib-inc=${zlib}/include "
-    " --with-openssl-inc=${openssl}/include "
-  ];
-
-  phaseNames = ["doConfigure" "doMakeInstall"];
-
-  name = "psi-" + version;
-  meta = {
-    description = "Psi, an XMPP (Jabber) client";
-  };
-}

pkgs/top-level/all-packages.nix

@@ -7743,12 +7743,11 @@ let
     inherit fetchurl stdenv tetex lazylist;
   };
 
-  psi = builderDefsPackage
+  psi = (selectVersion ../applications/networking/instant-messengers/psi "0.12.1")
-    (selectVersion ../applications/networking/instant-messengers/psi "0.12")
     {
-      inherit builderDefs zlib aspell sox openssl;
+      inherit stdenv fetchurl zlib aspell sox openssl qt4;
       inherit (xlibs) xproto libX11 libSM libICE;
-      qt = qt4;
+      qca2 = kde42.qca2;
     };
 
   putty = import ../applications/networking/remote/putty {