diff options
| author | Danny Wilson <danny@prime.vc> | 2015-11-22 23:58:37 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-11-23 11:42:00 +0100 |
| commit | d510109c54e32137197dd85b84f67c805650f951 (patch) | |
| tree | c8a1cacfdb74d280bf952e4a3f2b6b9be4a51abc | |
| parent | 1752268aed984552e0e2b7bcb1f90b61d61ece8b (diff) | |
| download | nixlib-d510109c54e32137197dd85b84f67c805650f951.tar nixlib-d510109c54e32137197dd85b84f67c805650f951.tar.gz nixlib-d510109c54e32137197dd85b84f67c805650f951.tar.bz2 nixlib-d510109c54e32137197dd85b84f67c805650f951.tar.lz nixlib-d510109c54e32137197dd85b84f67c805650f951.tar.xz nixlib-d510109c54e32137197dd85b84f67c805650f951.tar.zst nixlib-d510109c54e32137197dd85b84f67c805650f951.zip | |
SmartOS: texinfo: Fix build and make configureFlags target optional.
| -rw-r--r-- | pkgs/development/tools/misc/texinfo/6.0.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/texinfo/6.0.nix b/pkgs/development/tools/misc/texinfo/6.0.nix index 3aa77fd2e5fa..11e822291e8d 100644 --- a/pkgs/development/tools/misc/texinfo/6.0.nix +++ b/pkgs/development/tools/misc/texinfo/6.0.nix @@ -9,17 +9,17 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl xz ] - ++ stdenv.lib.optional stdenv.isSunOS libiconv + ++ stdenv.lib.optionals stdenv.isSunOS [ libiconv gawk ] ++ stdenv.lib.optional interactive ncurses; - configureFlags = "AWK=${gawk}/bin/awk"; + configureFlags = stdenv.lib.optionalString stdenv.isSunOS "AWK=${gawk}/bin/awk"; preInstall = '' installFlags="TEXMF=$out/texmf-dist"; installTargets="install install-tex"; ''; - doCheck = !stdenv.isDarwin && !interactive; + doCheck = !stdenv.isDarwin && !interactive && !stdenv.isSunOS/*flaky*/; meta = { homepage = "http://www.gnu.org/software/texinfo/"; |