diff options
Diffstat (limited to 'pkgs/development/tools/misc/texinfo/6.0.nix')
| -rw-r--r-- | pkgs/development/tools/misc/texinfo/6.0.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/texinfo/6.0.nix b/pkgs/development/tools/misc/texinfo/6.0.nix index 11e822291e8..507ca22cd1a 100644 --- a/pkgs/development/tools/misc/texinfo/6.0.nix +++ b/pkgs/development/tools/misc/texinfo/6.0.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, interactive ? false }: +{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "texinfo-6.0"; @@ -9,23 +11,25 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl xz ] - ++ stdenv.lib.optionals stdenv.isSunOS [ libiconv gawk ] - ++ stdenv.lib.optional interactive ncurses; + ++ optionals stdenv.isSunOS [ libiconv gawk ] + ++ optional interactive ncurses + ++ 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 = '' installFlags="TEXMF=$out/texmf-dist"; installTargets="install install-tex"; ''; - doCheck = !stdenv.isDarwin && !interactive && !stdenv.isSunOS/*flaky*/; + doCheck = interactive # simplify bootstrapping + && !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/; - meta = { + meta = with stdenv.lib; { homepage = "http://www.gnu.org/software/texinfo/"; description = "The GNU documentation system"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + platforms = platforms.all; longDescription = '' Texinfo is the official documentation format of the GNU project. @@ -42,6 +46,5 @@ stdenv.mkDerivation rec { need revise only that one document. The Texinfo system is well-integrated with GNU Emacs. ''; - branch = "5.2"; }; } |