From a64d7d844566b45a7a7e39c4fbb433d5a46c924c Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 7 Oct 2020 22:18:41 -0700
Subject: [PATCH] Revert "Revert "texinfo: revert to version 6.5 on Darwin""

This reverts commit 578b2b92dedac1f12f157e7ff4e80c7ee0235f08

(cherry picked from commit 93e135517ac50fd122f2cd0252bcb00487cfeb34)
---
 pkgs/development/tools/misc/texinfo/6.5.nix | 4 ++++
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/misc/texinfo/6.5.nix

diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix
new file mode 100644
index 00000000000..34596f30658
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/6.5.nix
@@ -0,0 +1,4 @@
+import ./common.nix {
+  version = "6.5";
+  sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4152d176a00..7ea0bbb91a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11687,8 +11687,10 @@ 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 = callPackage ../development/tools/misc/texinfo/6.7.nix { };
-  texinfo = texinfo6;
+  # Temporarily use older version on Darwin until it works.
+  texinfo = if stdenv.isDarwin then texinfo6_5 else texinfo6;
   texinfoInteractive = appendToName "interactive" (
     texinfo.override { interactive = true; }
   );