Updating psi, so it builds with gcc 4.4
svn path=/nixpkgs/trunk/; revision=20165
This commit is contained in:
parent
913503155a
commit
454fb58a39
2 changed files with 6 additions and 5 deletions
|
@ -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";
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue