Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 470b916556a8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ed3ec0be54e2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 3, 2020

  1. notmuch: extract optional dependencies

    @mredaelli
    mredaelli committed Apr 3, 2020
    Copy the full SHA
    b6f6fd8 View commit details

  2. Merge pull request #84008 from mredaelli/notmuch 

    notmuch: extract optional dependencies
    @flokli
    flokli authored Apr 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ed3ec0b View commit details
Showing with 25 additions and 12 deletions.
  1. +25 −12 pkgs/applications/networking/mailreaders/notmuch/default.nix
37 changes: 25 additions & 12 deletions pkgs/applications/networking/mailreaders/notmuch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{ fetchurl, stdenv
, pkgconfig, gnupg
, xapian, gmime, talloc, zlib
, doxygen, perl
, doxygen, perl, texinfo
, pythonPackages
, bash-completion
, emacs
, ruby
, which, dtach, openssl, bash, gdb, man
, withEmacs ? true
}:

with stdenv.lib;
@@ -25,15 +26,20 @@ stdenv.mkDerivation rec {
sha256 = "0dfwa38vgnxk9cvvpza66szjgp8lir6iz6yy0cry9593lywh9xym";
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [
pkgconfig
doxygen # (optional) api docs
pythonPackages.sphinx # (optional) documentation -> doc/INSTALL
texinfo # (optional) documentation -> doc/INSTALL
bash-completion # (optional) dependency to install bash completion
] ++ optional withEmacs [ emacs ];

buildInputs = [
gnupg # undefined dependencies
gnupg # undefined dependencies
xapian gmime talloc zlib # dependencies described in INSTALL
doxygen perl # (optional) api docs
pythonPackages.sphinx pythonPackages.python # (optional) documentation -> doc/INSTALL
bash-completion # (optional) dependency to install bash completion
emacs # (optional) to byte compile emacs code, also needed for tests
ruby # (optional) ruby bindings
perl
pythonPackages.python
ruby
];

postPatch = ''
@@ -42,20 +48,27 @@ stdenv.mkDerivation rec {
substituteInPlace lib/Makefile.local \
--replace '-install_name $(libdir)' "-install_name $out/lib"
'' + optionalString withEmacs ''
substituteInPlace emacs/notmuch-emacs-mua \
--replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
--replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient'
'';

configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" ];
configureFlags = [
"--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions"
"--infodir=${placeholder "info"}"
] ++ optional (!withEmacs) "--without-emacs"
++ optional (isNull ruby) "--without-ruby";

# Notmuch doesn't use autoconf and consequently doesn't tag --bindir and
# friends
setOutputFlags = false;
enableParallelBuilding = true;
makeFlags = [ "V=1" ];


outputs = [ "out" "man" "info" ];

preCheck = let
test-database = fetchurl {
url = "https://notmuchmail.org/releases/test-databases/database-v1.tar.xz";
@@ -68,10 +81,10 @@ stdenv.mkDerivation rec {
checkTarget = "test";
checkInputs = [
which dtach openssl bash
gdb man
gdb man emacs
];

installTargets = [ "install" "install-man" ];
installTargets = [ "install" "install-man" "install-info" ];

dontGzipMan = true; # already compressed