From 457fdb38425fd00378f213f9bd5c306ed99395bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 27 Feb 2014 08:22:41 +0100 Subject: [PATCH] texinfo: move ncurses support into texinfoInteractive This, for example, drops the stdenv dependency on ncurses. --- pkgs/development/tools/misc/texinfo/5.2.nix | 5 +++-- 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 1bb8fca0ecf..0a7446fe534 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 90cb16d0bec..08ac0eb93d3 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 { };