Update Psi

This commit is contained in:
Michael Raskin 2012-10-17 22:59:41 +04:00
parent 3b01ff4591
commit 640a13c04c

@ -1,32 +1,33 @@
{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM
, libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }: , libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib
, libXScrnSaver, scrnsaverproto
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "psi-0.14"; name = "psi-0.15";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/psi/${name}.tar.bz2"; url = "mirror://sourceforge/psi/${name}.tar.bz2";
sha256 = "1h54a1qryfva187sw9qnb4lv1d3h3lysqgw55v727swvslh4l0da"; sha256 = "593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6";
}; };
buildInputs = buildInputs =
[ aspell qt4 zlib sox libX11 xproto libSM libICE [ aspell qt4 zlib sox libX11 xproto libSM libICE
qca2 qca2_ossl pkgconfig which glib qca2 qca2_ossl pkgconfig which glib scrnsaverproto libXScrnSaver
]; ];
NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
NIX_LDFLAGS="-lqca"; NIX_LDFLAGS="-lqca";
configureFlags =
[ " --with-zlib-inc=${zlib}/include "
" --disable-bundled-qca"
];
psiMedia = callPackage ./psimedia.nix { }; psiMedia = callPackage ./psimedia.nix { };
enableParallelBuilding = true; enableParallelBuilding = true;
configureFlags = [
"--with-aspell-inc=${aspell}/include"
];
postInstall = '' postInstall = ''
PSI_PLUGINS="$out/lib/psi/plugins" PSI_PLUGINS="$out/lib/psi/plugins"
mkdir -p "$PSI_PLUGINS" mkdir -p "$PSI_PLUGINS"