diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2015-10-24 10:27:30 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-17 14:45:46 +0100 |
| commit | daa199a95ef542d00d7580a9bf7d2eaf51365c0e (patch) | |
| tree | cf7273f2a1158186a5d9c5a4d0936736c3ae56f3 /pkgs/development/tools/misc/texinfo | |
| parent | 82a21ccaf7b3913657eabbd085130c308461ebb9 (diff) | |
| download | nixpkgs-daa199a95ef542d00d7580a9bf7d2eaf51365c0e.tar nixpkgs-daa199a95ef542d00d7580a9bf7d2eaf51365c0e.tar.gz nixpkgs-daa199a95ef542d00d7580a9bf7d2eaf51365c0e.tar.bz2 nixpkgs-daa199a95ef542d00d7580a9bf7d2eaf51365c0e.tar.lz nixpkgs-daa199a95ef542d00d7580a9bf7d2eaf51365c0e.tar.xz nixpkgs-daa199a95ef542d00d7580a9bf7d2eaf51365c0e.tar.zst nixpkgs-daa199a95ef542d00d7580a9bf7d2eaf51365c0e.zip | |
texinfo: fix doCheck properly, cleanup (close #11527)
Diffstat (limited to 'pkgs/development/tools/misc/texinfo')
| -rw-r--r-- | pkgs/development/tools/misc/texinfo/5.2.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/texinfo/6.0.nix | 15 |
2 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index c43ebcd2de2..99582e0f8a3 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }: +{ stdenv, fetchurl, ncurses, perl, xz, procps, interactive ? false }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "texinfo-5.2"; @@ -9,7 +11,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl xz ] - ++ stdenv.lib.optional interactive ncurses; + ++ optional interactive ncurses + ++ optional doCheck procps; # for tests preInstall = '' installFlags="TEXMF=$out/texmf-dist"; @@ -21,8 +24,8 @@ stdenv.mkDerivation rec { meta = { 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. diff --git a/pkgs/development/tools/misc/texinfo/6.0.nix b/pkgs/development/tools/misc/texinfo/6.0.nix index 11e822291e8..c947586f0fb 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,8 +11,9 @@ 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"; @@ -19,13 +22,13 @@ stdenv.mkDerivation rec { installTargets="install install-tex"; ''; - doCheck = !stdenv.isDarwin && !interactive && !stdenv.isSunOS/*flaky*/; + doCheck = !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/; meta = { 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. |