From c1ef3d28546bee3b53718fc3435eab852f7b1d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 29 Jun 2013 17:06:08 +0200 Subject: [PATCH] texinfo5: add missing xz, use version 5.* by default --- pkgs/development/tools/misc/texinfo/5.1.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/texinfo/5.1.nix b/pkgs/development/tools/misc/texinfo/5.1.nix index cca368f619a6..cbb108301883 100644 --- a/pkgs/development/tools/misc/texinfo/5.1.nix +++ b/pkgs/development/tools/misc/texinfo/5.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl }: +{ stdenv, fetchurl, ncurses, perl, xz }: stdenv.mkDerivation rec { name = "texinfo-5.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0864v5i488x3mb3v5p6nhy2kw0mqkzpa3b0453iibj81zlpq078q"; }; - buildInputs = [ ncurses perl ]; + buildInputs = [ ncurses perl xz ]; preInstall = '' installFlags="TEXMF=$out/texmf"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6df3b4f4d7b7..b73d01f7e092 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3541,7 +3541,7 @@ let texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { }; texinfo5 = callPackage ../development/tools/misc/texinfo/5.1.nix { }; - texinfo = texinfo413; + texinfo = texinfo5; texi2html = callPackage ../development/tools/misc/texi2html { };