From 0b89ece569b44635404c019fe090711549853371 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 4 Sep 2018 21:53:19 +0000 Subject: [PATCH] Revert "texinfoInteractive: fixup build by using older perl" This reverts commit 7a22083e1271869294a074cbe7a971f2d8abb4f4. --- pkgs/top-level/all-packages.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f563f0dfe24..67385abb505 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8743,13 +8743,9 @@ with pkgs; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; texinfo = texinfo6; - texinfoInteractive = appendToName "interactive" (texinfo.override { - interactive = true; - # doCheck = true -> some xlocale.h problem with perl 5.28.0 - # (it's mistakenly trying to include the non-existent header) - perl = perl526; - buildPackages = buildPackages // { perl = buildPackages.perl526; }; - }); + texinfoInteractive = appendToName "interactive" ( + texinfo.override { interactive = true; } + ); texi2html = callPackage ../development/tools/misc/texi2html { };