diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-02-27 08:22:41 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-04-02 19:05:56 +0200 |
| commit | 457fdb38425fd00378f213f9bd5c306ed99395bf (patch) | |
| tree | ba2c597795b0150993ba6a6c80315157af63a4fc /pkgs | |
| parent | 11d4c257c1eb10f5186535076c55ef767c777d7f (diff) | |
| download | nixlib-457fdb38425fd00378f213f9bd5c306ed99395bf.tar nixlib-457fdb38425fd00378f213f9bd5c306ed99395bf.tar.gz nixlib-457fdb38425fd00378f213f9bd5c306ed99395bf.tar.bz2 nixlib-457fdb38425fd00378f213f9bd5c306ed99395bf.tar.lz nixlib-457fdb38425fd00378f213f9bd5c306ed99395bf.tar.xz nixlib-457fdb38425fd00378f213f9bd5c306ed99395bf.tar.zst nixlib-457fdb38425fd00378f213f9bd5c306ed99395bf.zip | |
texinfo: move ncurses support into texinfoInteractive
This, for example, drops the stdenv dependency on ncurses.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/texinfo/5.2.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index 1bb8fca0ecff..0a7446fe5344 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl, xz }: +{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }: stdenv.mkDerivation rec { name = "texinfo-5.2"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal"; }; - buildInputs = [ ncurses perl xz ]; + buildInputs = [ perl xz ] + ++ stdenv.lib.optional interactive ncurses; preInstall = '' installFlags="TEXMF=$out/texmf-dist"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90cb16d0bec1..08ac0eb93d3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3914,6 +3914,9 @@ let texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo4 = texinfo413; texinfo = texinfo5; + texinfoInteractive = appendToName "interactive" ( + texinfo.override { interactive = true; } + ); texi2html = callPackage ../development/tools/misc/texi2html { }; |