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/top-level/all-packages.nix | |
parent | abed7b8441a95c7a590537c8e6d27f44f51f4493 (diff) | |
download | nixpkgs-b49285ad27933771064ead9ff0f69971a6f1e1ec.tar nixpkgs-b49285ad27933771064ead9ff0f69971a6f1e1ec.tar.gz nixpkgs-b49285ad27933771064ead9ff0f69971a6f1e1ec.tar.bz2 nixpkgs-b49285ad27933771064ead9ff0f69971a6f1e1ec.tar.lz nixpkgs-b49285ad27933771064ead9ff0f69971a6f1e1ec.tar.xz nixpkgs-b49285ad27933771064ead9ff0f69971a6f1e1ec.tar.zst nixpkgs-b49285ad27933771064ead9ff0f69971a6f1e1ec.zip |
Updating psi to a working version with ssl, using kde42 qca.
svn path=/nixpkgs/trunk/; revision=15842
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b02bd741216..3a5499461ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7743,12 +7743,11 @@ let inherit fetchurl stdenv tetex lazylist; }; - psi = builderDefsPackage - (selectVersion ../applications/networking/instant-messengers/psi "0.12") + psi = (selectVersion ../applications/networking/instant-messengers/psi "0.12.1") { - 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 { |