From 4e435e6f99d70ead6331944e16e9ef6d6f9e2792 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 7 Oct 2020 22:20:43 -0700 Subject: [PATCH] texinfo: default to texinfo6.7 on darwin --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ea0bbb91a3..d07da20332c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11687,10 +11687,9 @@ in texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; - texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; + texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; - # Temporarily use older version on Darwin until it works. - texinfo = if stdenv.isDarwin then texinfo6_5 else texinfo6; + texinfo = texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } );