diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-06-03 18:23:49 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-06-03 18:23:49 +0000 |
commit | b49285ad27933771064ead9ff0f69971a6f1e1ec (patch) | |
tree | 88f95338dfd8911e88cadb3c7303dbe5559ebec9 /pkgs/applications/networking | |
parent | abed7b8441a95c7a590537c8e6d27f44f51f4493 (diff) | |
download | nixlib-b49285ad27933771064ead9ff0f69971a6f1e1ec.tar nixlib-b49285ad27933771064ead9ff0f69971a6f1e1ec.tar.gz nixlib-b49285ad27933771064ead9ff0f69971a6f1e1ec.tar.bz2 nixlib-b49285ad27933771064ead9ff0f69971a6f1e1ec.tar.lz nixlib-b49285ad27933771064ead9ff0f69971a6f1e1ec.tar.xz nixlib-b49285ad27933771064ead9ff0f69971a6f1e1ec.tar.zst nixlib-b49285ad27933771064ead9ff0f69971a6f1e1ec.zip |
Updating psi to a working version with ssl, using kde42 qca.
svn path=/nixpkgs/trunk/; revision=15842
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 19 insertions, 40 deletions
diff --git a/pkgs/applications/networking/instant-messengers/psi/0.11.nix b/pkgs/applications/networking/instant-messengers/psi/0.11.nix deleted file mode 100644 index 2f9d9e3b3b72..000000000000 --- a/pkgs/applications/networking/instant-messengers/psi/0.11.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/psi/0.12.1.nix b/pkgs/applications/networking/instant-messengers/psi/0.12.1.nix new file mode 100644 index 000000000000..027d3192a976 --- /dev/null +++ b/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"; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/psi/0.12.nix b/pkgs/applications/networking/instant-messengers/psi/0.12.nix deleted file mode 100644 index a9af276661fb..000000000000 --- a/pkgs/applications/networking/instant-messengers/psi/0.12.nix +++ /dev/null @@ -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"; - }; -} |