texinfo: cleanups and doCheck = false for non-interactive

... to simplify bootstrapping. Discussion on #11527.
This commit is contained in:
Vladimír Čunát 2015-12-17 08:42:28 +01:00
parent daa199a95e
commit 5d4f0b556e

View file

@ -15,14 +15,15 @@ stdenv.mkDerivation rec {
++ optional interactive ncurses ++ optional interactive ncurses
++ optional doCheck procps; # for tests ++ optional doCheck procps; # for tests
configureFlags = stdenv.lib.optionalString stdenv.isSunOS "AWK=${gawk}/bin/awk"; configureFlags = stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
preInstall = '' preInstall = ''
installFlags="TEXMF=$out/texmf-dist"; installFlags="TEXMF=$out/texmf-dist";
installTargets="install install-tex"; installTargets="install install-tex";
''; '';
doCheck = !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/; doCheck = interactive # simplify bootstrapping
&& !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/;
meta = { meta = {
homepage = "http://www.gnu.org/software/texinfo/"; homepage = "http://www.gnu.org/software/texinfo/";
@ -45,6 +46,5 @@ stdenv.mkDerivation rec {
need revise only that one document. The Texinfo system is need revise only that one document. The Texinfo system is
well-integrated with GNU Emacs. well-integrated with GNU Emacs.
''; '';
branch = "5.2";
}; };
} }