public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix psi build

Browse Source 
hydra.nixos.org/build/3154247
This commit is contained in:
Eelco Dolstra 2012-10-15 10:21:13 -04:00
parent 70334f04ee
commit b377586b7a
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/networking/instant-messengers/psi/default.nix
View File

@ -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, callPackage, which, glib }: , libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "psi-0.14"; name = "psi-0.14";
@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1h54a1qryfva187sw9qnb4lv1d3h3lysqgw55v727swvslh4l0da"; sha256 = "1h54a1qryfva187sw9qnb4lv1d3h3lysqgw55v727swvslh4l0da";
}; };
buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE buildInputs =
qca2 qca2_ossl pkgconfig which glib]; [ aspell qt4 zlib sox libX11 xproto libSM libICE
qca2 qca2_ossl pkgconfig which glib
];
NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
@ -23,6 +25,8 @@ stdenv.mkDerivation rec {
psiMedia = callPackage ./psimedia.nix { }; psiMedia = callPackage ./psimedia.nix { };
enableParallelBuilding = true;
postInstall = '' postInstall = ''
PSI_PLUGINS="$out/lib/psi/plugins" PSI_PLUGINS="$out/lib/psi/plugins"
mkdir -p "$PSI_PLUGINS" mkdir -p "$PSI_PLUGINS"
@ -34,9 +38,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Psi, an XMPP (Jabber) client"; description = "Psi, an XMPP (Jabber) client";
maintainers = with stdenv.lib.maintainers; maintainers = [ stdenv.lib.maintainers.raskin ];
[raskin]; platforms = stdenv.lib.platforms.linux;
platforms = with stdenv.lib.platforms;
linux;
}; };
} }

8
pkgs/applications/networking/instant-messengers/psi/psimedia.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which { stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which
, glib, pkgconfig}: , glib, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "psimedia"; name = "psimedia";
@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781"; sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781";
}; };
buildInputs = [qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig]; patches = [ ./glib-2.32.patch ];
buildInputs = [ qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig ];
configurePhase = ''./configure''; configurePhase = ''./configure'';