public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

texinfo: move ncurses support into texinfoInteractive

Browse Source 
This, for example, drops the stdenv dependency on ncurses.
This commit is contained in:
Vladimír Čunát 2014-02-27 08:22:41 +01:00
parent 11d4c257c1
commit 457fdb3842
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/tools/misc/texinfo/5.2.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, perl, xz }: { stdenv, fetchurl, ncurses, perl, xz, interactive ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "texinfo-5.2"; name = "texinfo-5.2";
@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal"; sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
}; };
buildInputs = [ ncurses perl xz ]; buildInputs = [ perl xz ]
++ stdenv.lib.optional interactive ncurses;
preInstall = '' preInstall = ''
installFlags="TEXMF=$out/texmf-dist"; installFlags="TEXMF=$out/texmf-dist";

3
pkgs/top-level/all-packages.nix
View File

@ -3914,6 +3914,9 @@ let
texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
texinfo4 = texinfo413; texinfo4 = texinfo413;
texinfo = texinfo5; texinfo = texinfo5;
texinfoInteractive = appendToName "interactive" (
texinfo.override { interactive = true; }
);
texi2html = callPackage ../development/tools/misc/texi2html { }; texi2html = callPackage ../development/tools/misc/texi2html { };