pyrox.dev
Updating psi, so it builds with gcc 4.4
svn path=/nixpkgs/trunk/; revision=20165
+4
-4
pkgs/applications/networking/instant-messengers/psi/default.nix
+4
-4
pkgs/applications/networking/instant-messengers/psi/default.nix
···
1
-
{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, libICE, qca2 }:
1
+
{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, libICE, qca2, pkgconfig }:
2
2
3
3
stdenv.mkDerivation rec {
4
-
name = "psi-0.12.1";
4
+
name = "psi-0.14";
5
5
6
6
src = fetchurl {
7
7
url = "mirror://sourceforge/psi/${name}.tar.bz2";
8
-
sha256 = "0zi71fcia9amcasa6zrvfyghdpqa821iv2rkj53bq5dyvfm2y0m8";
8
+
sha256 = "1h54a1qryfva187sw9qnb4lv1d3h3lysqgw55v727swvslh4l0da";
9
9
};
10
10
11
-
buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE qca2];
11
+
buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE qca2 pkgconfig];
12
12
13
13
NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
14
14
+2
-1
pkgs/top-level/all-packages.nix
+2
-1
pkgs/top-level/all-packages.nix
···
9013
9013
};
9014
9014
9015
9015
psi = (import ../applications/networking/instant-messengers/psi) {
9016
-
inherit stdenv fetchurl zlib aspell sox qt4;
9016
+
inherit stdenv fetchurl zlib aspell sox pkgconfig;
9017
9017
inherit (xlibs) xproto libX11 libSM libICE;
9018
9018
qca2 = kde4.qca2;
9019
+
qt4 = qt46;
9019
9020
};
9020
9021
9021
9022
putty = import ../applications/networking/remote/putty {