diff options
author | Jan Malakhovski <oxij@oxij.org> | 2017-09-01 00:01:42 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2017-09-16 09:20:05 +0000 |
commit | ae86fddd95e5b616b52e1707f3a82ac33d445c25 (patch) | |
tree | 16f45b65ba0abd67f6cb1f7e088ddc7383e9ef70 /pkgs/applications/networking/mailreaders | |
parent | 04e97f98685bd8bf2ece6bf89c50366f4ed87fa1 (diff) |
notmuch: switch to gmime3, make all tests pass with gmime3
Diffstat (limited to 'pkgs/applications/networking/mailreaders')
-rw-r--r-- | pkgs/applications/networking/mailreaders/notmuch/default.nix | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index d9af01bdad419..74e43a728d7fd 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fixDarwinDylibNames, gdb +{ fetchurl, stdenv, fixDarwinDylibNames , pkgconfig, gnupg , xapian, gmime, talloc, zlib , doxygen, perl @@ -6,9 +6,11 @@ , bash-completion , emacs , ruby -, which, dtach, openssl, bash +, which, dtach, openssl, bash, gdb, man }: +with stdenv.lib; + stdenv.mkDerivation rec { version = "0.25"; name = "notmuch-${version}"; @@ -32,19 +34,11 @@ stdenv.mkDerivation rec { emacs # (optional) to byte compile emacs code ruby # (optional) ruby bindings which dtach openssl bash # test dependencies - ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames - ++ stdenv.lib.optional (!stdenv.isDarwin) gdb; - - doCheck = !stdenv.isDarwin; - checkTarget = "test"; - - patchPhase = '' - # XXX: disabling few tests since i have no idea how to make them pass for now - rm -f test/T010-help-test.sh \ - test/T350-crypto.sh \ - test/T355-smime.sh + ] + ++ optional stdenv.isDarwin fixDarwinDylibNames + ++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies + postPatch = '' find test -type f -exec \ sed -i \ -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ @@ -65,7 +59,9 @@ stdenv.mkDerivation rec { done ''; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + makeFlags = "V=1"; + + preFixup = optionalString stdenv.isDarwin '' set -e die() { @@ -92,12 +88,16 @@ stdenv.mkDerivation rec { install_name_tool -change "$badname" "$goodname" "$prg" ''; + doCheck = !stdenv.isDarwin && (versionAtLeast gmime.version "3.0"); + checkTarget = "test V=1"; + postInstall = '' make install-man ''; + dontGzipMan = true; # already compressed - meta = with stdenv.lib; { + meta = { description = "Mail indexer"; homepage = https://notmuchmail.org/; license = licenses.gpl3; |