Merge pull request #30421 from KaiHa/lbdb-0.44

lbdb: 0.38 -> 0.44
This commit is contained in:
Jörg Thalheim 2017-10-16 08:46:22 +01:00 committed by GitHub
commit e4532af925
3 changed files with 39 additions and 6 deletions

View file

@ -0,0 +1,11 @@
--- a/lbdb.rc.in
+++ b/lbdb.rc.in
@@ -40,7 +40,7 @@
# - m_vcf search a vcard (according to RFC2426) file.
# - m_khard search a CardDAV address book via khard
-METHODS="m_inmail m_passwd m_finger"
+METHODS="@MODULES@"
#

View file

@ -1,17 +1,39 @@
{ stdenv, fetchurl, perl, finger_bsd }:
{ stdenv, fetchurl, perl, perlPackages, finger_bsd, makeWrapper
, abook ? null
, gnupg ? null
, goobook ? null
, khard ? null
}:
let
version = "0.38";
version = "0.44";
in
with stdenv.lib;
with perlPackages;
stdenv.mkDerivation {
name = "lbdb-${version}";
src = fetchurl {
url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz";
sha256 = "1279ssfrh4cqrjzq5q47xbdlw5qx3aazxjshi86ljm4cw6xxvgar";
sha256 = "0kjz3n2ilrg6yrz8z40714ppdprgwhbgvzcsjzs822l6da4qxna3";
};
buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) finger_bsd;
buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ]
++ optional (!stdenv.isDarwin) finger_bsd
++ optional (abook != null) abook
++ optional (gnupg != null) gnupg
++ optional (goobook != null) goobook
++ optional (khard != null) khard;
configureFlags = [ ]
++ optional (abook != null) "--with-abook"
++ optional (gnupg != null) "--with-gpg"
++ optional (goobook != null) "--with-goobook"
++ optional (khard != null) "--with-khard";
patches = [ ./add-methods-to-rc.patch ];
postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : "
+ "${AuthenSASL}/${perl.libPrefix}"
+ ":${ConvertASN1}/${perl.libPrefix}"
+ ":${NetLDAP}/${perl.libPrefix}";
meta = {
homepage = http://www.spinnaker.de/lbdb/;

View file

@ -15307,7 +15307,7 @@ with pkgs;
lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { };
lbdb = callPackage ../tools/misc/lbdb { };
lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; };
lbzip2 = callPackage ../tools/compression/lbzip2 { };