diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-22 09:53:17 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-22 09:53:17 +0000 |
| commit | 454fb58a39610db32c8b4abdf3299254cedfda84 (patch) | |
| tree | 471a056167e8d0612bccbcc847d3ebf572761150 /pkgs | |
| parent | 913503155a2d880cc43507a68e0d55df6062013b (diff) | |
| download | nixpkgs-454fb58a39610db32c8b4abdf3299254cedfda84.tar nixpkgs-454fb58a39610db32c8b4abdf3299254cedfda84.tar.gz nixpkgs-454fb58a39610db32c8b4abdf3299254cedfda84.tar.bz2 nixpkgs-454fb58a39610db32c8b4abdf3299254cedfda84.tar.lz nixpkgs-454fb58a39610db32c8b4abdf3299254cedfda84.tar.xz nixpkgs-454fb58a39610db32c8b4abdf3299254cedfda84.tar.zst nixpkgs-454fb58a39610db32c8b4abdf3299254cedfda84.zip | |
Updating psi, so it builds with gcc 4.4
svn path=/nixpkgs/trunk/; revision=20165
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/psi/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 0db1af883cb..23f27b3caa9 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, libICE, qca2 }: +{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, libICE, qca2, pkgconfig }: stdenv.mkDerivation rec { - name = "psi-0.12.1"; + name = "psi-0.14"; src = fetchurl { url = "mirror://sourceforge/psi/${name}.tar.bz2"; - sha256 = "0zi71fcia9amcasa6zrvfyghdpqa821iv2rkj53bq5dyvfm2y0m8"; + sha256 = "1h54a1qryfva187sw9qnb4lv1d3h3lysqgw55v727swvslh4l0da"; }; - buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE qca2]; + buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE qca2 pkgconfig]; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee905a2d01c..5f32294f602 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9013,9 +9013,10 @@ let }; psi = (import ../applications/networking/instant-messengers/psi) { - inherit stdenv fetchurl zlib aspell sox qt4; + inherit stdenv fetchurl zlib aspell sox pkgconfig; inherit (xlibs) xproto libX11 libSM libICE; qca2 = kde4.qca2; + qt4 = qt46; }; putty = import ../applications/networking/remote/putty { |