Get psi to compile with kde47 and kde48.
svn path=/nixpkgs/trunk/; revision=31799
This commit is contained in:
parent
90563b958f
commit
39206f5b44
@ -1,5 +1,5 @@
|
|||||||
{ 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, gst_all }:
|
libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, gst_all, which, glib }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "psi-0.14";
|
name = "psi-0.14";
|
||||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE
|
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";
|
NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
|
||||||
|
|
||||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
psiMedia = (import ./psimedia.nix) {
|
psiMedia = (import ./psimedia.nix) {
|
||||||
inherit stdenv fetchurl qt4 speex gst_all liboil;
|
inherit stdenv fetchurl qt4 speex gst_all liboil which glib pkgconfig;
|
||||||
};
|
};
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl, qt4, gst_all, liboil, speex}:
|
{stdenv, fetchurl, qt4, gst_all, liboil, speex, which, glib, pkgconfig}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "psimedia";
|
name = "psimedia";
|
||||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781";
|
sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [qt4 gst_all.gstreamer gst_all.gstPluginsBase liboil speex];
|
buildInputs = [qt4 gst_all.gstreamer gst_all.gstPluginsBase liboil speex which glib pkgconfig];
|
||||||
|
|
||||||
configurePhase = ''./configure'';
|
configurePhase = ''./configure'';
|
||||||
|
|
||||||
|
@ -8200,7 +8200,9 @@ let
|
|||||||
|
|
||||||
polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
|
polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
|
||||||
|
|
||||||
psi = callPackage ../applications/networking/instant-messengers/psi { };
|
psi = callPackage ../applications/networking/instant-messengers/psi {
|
||||||
|
inherit (gtkLibs) glib;
|
||||||
|
};
|
||||||
|
|
||||||
quassel = callPackage ../applications/networking/irc/quassel { };
|
quassel = callPackage ../applications/networking/irc/quassel { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user