diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-15 10:21:13 -0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-15 10:52:53 -0400 |
commit | b377586b7a5efd07de49ec2cf3bff73a960c0994 (patch) | |
tree | 6eea09158c9e511f2e0497a768aa95d04efa1da0 /pkgs/applications/networking/instant-messengers | |
parent | 70334f04ee62efeec44e043ea4548fbf594890db (diff) | |
download | nixpkgs-b377586b7a5efd07de49ec2cf3bff73a960c0994.tar nixpkgs-b377586b7a5efd07de49ec2cf3bff73a960c0994.tar.gz nixpkgs-b377586b7a5efd07de49ec2cf3bff73a960c0994.tar.bz2 nixpkgs-b377586b7a5efd07de49ec2cf3bff73a960c0994.tar.lz nixpkgs-b377586b7a5efd07de49ec2cf3bff73a960c0994.tar.xz nixpkgs-b377586b7a5efd07de49ec2cf3bff73a960c0994.tar.zst nixpkgs-b377586b7a5efd07de49ec2cf3bff73a960c0994.zip |
Fix psi build
hydra.nixos.org/build/3154247
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/psi/default.nix | 22 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/psi/psimedia.nix | 8 |
2 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 2c6ba36c44f..7f9d61f9c44 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, - libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }: +{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM +, libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }: stdenv.mkDerivation rec { name = "psi-0.14"; - + src = fetchurl { url = "mirror://sourceforge/psi/${name}.tar.bz2"; sha256 = "1h54a1qryfva187sw9qnb4lv1d3h3lysqgw55v727swvslh4l0da"; }; - buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE - qca2 qca2_ossl pkgconfig which glib]; + buildInputs = + [ aspell qt4 zlib sox libX11 xproto libSM libICE + qca2 qca2_ossl pkgconfig which glib + ]; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; - + NIX_LDFLAGS="-lqca"; configureFlags = @@ -23,6 +25,8 @@ stdenv.mkDerivation rec { psiMedia = callPackage ./psimedia.nix { }; + enableParallelBuilding = true; + postInstall = '' PSI_PLUGINS="$out/lib/psi/plugins" mkdir -p "$PSI_PLUGINS" @@ -34,9 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Psi, an XMPP (Jabber) client"; - maintainers = with stdenv.lib.maintainers; - [raskin]; - platforms = with stdenv.lib.platforms; - linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix index df821da42f2..993a018625e 100644 --- a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix +++ b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which -, glib, pkgconfig}: +{ stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which +, glib, pkgconfig }: stdenv.mkDerivation rec { name = "psimedia"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { 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''; |