diff options
| author | Kai Harries <kai.harries@gmail.com> | 2017-10-14 21:47:13 +0200 |
|---|---|---|
| committer | Kai Harries <kai.harries@gmail.com> | 2017-10-14 22:02:13 +0200 |
| commit | c37198e81d7b96568e6c4c82a48fc7cfb7247dd7 (patch) | |
| tree | 1a5d205e872a304b159e088e079f4ddcdecd0540 /pkgs/tools/misc | |
| parent | 3fe7cddc304abb86e61a750a4f807270c7ca7825 (diff) | |
| download | nixlib-c37198e81d7b96568e6c4c82a48fc7cfb7247dd7.tar nixlib-c37198e81d7b96568e6c4c82a48fc7cfb7247dd7.tar.gz nixlib-c37198e81d7b96568e6c4c82a48fc7cfb7247dd7.tar.bz2 nixlib-c37198e81d7b96568e6c4c82a48fc7cfb7247dd7.tar.lz nixlib-c37198e81d7b96568e6c4c82a48fc7cfb7247dd7.tar.xz nixlib-c37198e81d7b96568e6c4c82a48fc7cfb7247dd7.tar.zst nixlib-c37198e81d7b96568e6c4c82a48fc7cfb7247dd7.zip | |
lbdb: 0.38 -> 0.44
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/lbdb/add-methods-to-rc.patch | 11 | ||||
| -rw-r--r-- | pkgs/tools/misc/lbdb/default.nix | 32 |
2 files changed, 38 insertions, 5 deletions
diff --git a/pkgs/tools/misc/lbdb/add-methods-to-rc.patch b/pkgs/tools/misc/lbdb/add-methods-to-rc.patch new file mode 100644 index 000000000000..d388467559a4 --- /dev/null +++ b/pkgs/tools/misc/lbdb/add-methods-to-rc.patch @@ -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@" + + + # diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index e81ad349874b..35cc95cb2cf7 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -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/; |