alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

bitlbee-otr: Correctly link against libgcrypt.

Browse source 
svn path=/nixpkgs/trunk/; revision=12926
This commit is contained in:
Ludovic Courtès 2008-09-26 12:32:06 +00:00
parent d495ee42d9
commit fab4b2bca4
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/networking/instant-messengers/bitlbee-otr/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchbzr, gnutls, glib, pkgconfig, libotr
{ stdenv, fetchbzr, gnutls, glib, pkgconfig, libotr, libgcrypt
, libxslt, xmlto, docbook_xsl, docbook_xml_dtd_42, perl }:
let revision = "369"; in
@ -11,11 +11,14 @@ stdenv.mkDerivation rec {
};
patchPhase = ''
# Both OTR and GnuTLS depend on libgcrypt, but for some reason, `bitlbee'
# must be explicitly linked against it.
sed -i "configure" -e "s|-f \$""{i}/lib/libotr.a|0 -eq 0|g ;
s|otrprefix=\$""{i}|otrprefix=\"${libotr}\"|g";
s|otrprefix=\$""{i}|otrprefix=\"${libotr}\"|g ;
s|-lotr|-lotr -L${libgcrypt} -lgcrypt|g";
'';
buildInputs = [ gnutls glib pkgconfig libotr
buildInputs = [ gnutls glib pkgconfig libotr libgcrypt
libxslt xmlto docbook_xsl docbook_xml_dtd_42 perl
];

2
pkgs/top-level/all-packages.nix
View file

@ -5855,7 +5855,7 @@ let
};
bitlbeeOtr = import ../applications/networking/instant-messengers/bitlbee-otr {
inherit fetchbzr stdenv gnutls pkgconfig libotr
inherit fetchbzr stdenv gnutls pkgconfig libotr libgcrypt
libxslt xmlto docbook_xsl docbook_xml_dtd_42 perl;
inherit (gtkLibs) glib;
};