Merge pull request #84663 from flokli/notmuch-multiple-output
notmuch: add separate `emacs` output
This commit is contained in:
commit
68d37fe0c0
@ -215,7 +215,13 @@ environment.systemPackages = [
|
|||||||
|
|
||||||
<itemizedlist>
|
<itemizedlist>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para />
|
<para>
|
||||||
|
The <package>notmuch</package> package move its emacs-related binaries and
|
||||||
|
emacs lisp files to a separate output. They're not part
|
||||||
|
of the default <literal>out<literal> output anymore - if you relied on the
|
||||||
|
<literal>notmuch-emacs-mua</literal> binary or the emacs lisp files, access them via
|
||||||
|
the <literal>notmuch.emacs</literal> output.
|
||||||
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</section>
|
</section>
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
, xapian, gmime, talloc, zlib
|
, xapian, gmime, talloc, zlib
|
||||||
, doxygen, perl, texinfo
|
, doxygen, perl, texinfo
|
||||||
, pythonPackages
|
, pythonPackages
|
||||||
, bash-completion
|
|
||||||
, emacs
|
, emacs
|
||||||
, ruby
|
, ruby
|
||||||
, which, dtach, openssl, bash, gdb, man
|
, which, dtach, openssl, bash, gdb, man
|
||||||
@ -31,7 +30,6 @@ stdenv.mkDerivation rec {
|
|||||||
doxygen # (optional) api docs
|
doxygen # (optional) api docs
|
||||||
pythonPackages.sphinx # (optional) documentation -> doc/INSTALL
|
pythonPackages.sphinx # (optional) documentation -> doc/INSTALL
|
||||||
texinfo # (optional) documentation -> doc/INSTALL
|
texinfo # (optional) documentation -> doc/INSTALL
|
||||||
bash-completion # (optional) dependency to install bash completion
|
|
||||||
] ++ optional withEmacs [ emacs ];
|
] ++ optional withEmacs [ emacs ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
@ -56,8 +54,10 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions"
|
"--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions"
|
||||||
|
"--bashcompletiondir=${placeholder "out"}/share/bash-completion/completions"
|
||||||
"--infodir=${placeholder "info"}"
|
"--infodir=${placeholder "info"}"
|
||||||
] ++ optional (!withEmacs) "--without-emacs"
|
] ++ optional (!withEmacs) "--without-emacs"
|
||||||
|
++ optional (withEmacs) "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp"
|
||||||
++ optional (isNull ruby) "--without-ruby";
|
++ optional (isNull ruby) "--without-ruby";
|
||||||
|
|
||||||
# Notmuch doesn't use autoconf and consequently doesn't tag --bindir and
|
# Notmuch doesn't use autoconf and consequently doesn't tag --bindir and
|
||||||
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
|||||||
makeFlags = [ "V=1" ];
|
makeFlags = [ "V=1" ];
|
||||||
|
|
||||||
|
|
||||||
outputs = [ "out" "man" "info" ];
|
outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional withEmacs "emacs";
|
||||||
|
|
||||||
preCheck = let
|
preCheck = let
|
||||||
test-database = fetchurl {
|
test-database = fetchurl {
|
||||||
@ -86,6 +86,10 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
installTargets = [ "install" "install-man" "install-info" ];
|
installTargets = [ "install" "install-man" "install-info" ];
|
||||||
|
|
||||||
|
postInstall = stdenv.lib.optionalString withEmacs ''
|
||||||
|
moveToOutput bin/notmuch-emacs-mua $emacs
|
||||||
|
'';
|
||||||
|
|
||||||
dontGzipMan = true; # already compressed
|
dontGzipMan = true; # already compressed
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
Loading…
Reference in New Issue
Block a user