diff options
author | Karn Kallio <tierpluspluslists@gmail.com> | 2012-01-24 00:00:34 +0000 |
---|---|---|
committer | Karn Kallio <tierpluspluslists@gmail.com> | 2012-01-24 00:00:34 +0000 |
commit | 39206f5b44616d64b7d67eb6f309bedd1c9c2cae (patch) | |
tree | c6d82d53ec812f356d99ec998e20dcc73678a722 /pkgs/applications/networking/instant-messengers/psi/default.nix | |
parent | 90563b958fd097713250c310e921bb0ee71694d8 (diff) | |
download | nixlib-39206f5b44616d64b7d67eb6f309bedd1c9c2cae.tar nixlib-39206f5b44616d64b7d67eb6f309bedd1c9c2cae.tar.gz nixlib-39206f5b44616d64b7d67eb6f309bedd1c9c2cae.tar.bz2 nixlib-39206f5b44616d64b7d67eb6f309bedd1c9c2cae.tar.lz nixlib-39206f5b44616d64b7d67eb6f309bedd1c9c2cae.tar.xz nixlib-39206f5b44616d64b7d67eb6f309bedd1c9c2cae.tar.zst nixlib-39206f5b44616d64b7d67eb6f309bedd1c9c2cae.zip |
Get psi to compile with kde47 and kde48.
svn path=/nixpkgs/trunk/; revision=31799
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/psi/default.nix')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/psi/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index b0819da4c6e5..b4c4c1f476f6 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, - libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, gst_all }: + libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, gst_all, which, glib }: stdenv.mkDerivation rec { name = "psi-0.14"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE - qca2 qca2_ossl pkgconfig]; + qca2 qca2_ossl pkgconfig which glib]; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; psiMedia = (import ./psimedia.nix) { - inherit stdenv fetchurl qt4 speex gst_all liboil; + inherit stdenv fetchurl qt4 speex gst_all liboil which glib pkgconfig; }; postInstall = '' |