From 30f7045f2f3a3e5a326d405f0770e40124999abb Mon Sep 17 00:00:00 2001
From: tesnos6921 <7860497+tesnos6921@users.noreply.github.com>
Date: Tue, 30 Jul 2024 12:25:52 -0400
Subject: [PATCH 1/2] Don't run tests when cross compiling

---
 pkgs/development/tools/misc/texinfo/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 9b5959d40e47b..658b85722840b 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation {
 
   nativeCheckInputs = [ procps ] ++ optionals stdenv.buildPlatform.isFreeBSD [ freebsd.locale ];
 
-  doCheck = interactive && !stdenv.isDarwin && !stdenv.isSunOS; # flaky
+  doCheck = interactive && !stdenv.isDarwin && !stdenv.isSunOS && stdenv.buildPlatform == stdenv.hostPlatform; # flaky
 
   checkFlags = optionals (!stdenv.hostPlatform.isMusl && versionOlder version "7") [
     # Test is known to fail on various locales on texinfo-6.8:

From fb0b3be6bfedc73fc378302303ee77653ecf08dd Mon Sep 17 00:00:00 2001
From: tesnos6921 <7860497+tesnos6921@users.noreply.github.com>
Date: Tue, 30 Jul 2024 12:38:35 -0400
Subject: [PATCH 2/2] Update common.nix

---
 pkgs/development/tools/misc/texinfo/common.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 658b85722840b..07abdc5c08e87 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -93,13 +93,14 @@ stdenv.mkDerivation {
     ++ optional interactive ncurses;
 
   configureFlags =
-    [ "PERL=${buildPackages.perl}/bin/perl" ]
+    [ "PERL=${buildPackages.perl}/bin/perl"  ]
     # Perl XS modules are difficult to cross-compile and texinfo has pure Perl
     # fallbacks.
     # Also prevent the buildPlatform's awk being used in the texindex script
     ++ optionals crossBuildTools [
       "--enable-perl-xs=no"
       "TI_AWK=${getBin gawk}/bin/awk"
+      "texinfo_cv_sys_iconv_converts_euc_cn=yes"
     ]
     ++ optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
 
@@ -111,7 +112,7 @@ stdenv.mkDerivation {
 
   nativeCheckInputs = [ procps ] ++ optionals stdenv.buildPlatform.isFreeBSD [ freebsd.locale ];
 
-  doCheck = interactive && !stdenv.isDarwin && !stdenv.isSunOS && stdenv.buildPlatform == stdenv.hostPlatform; # flaky
+  doCheck = interactive && !stdenv.isDarwin && !stdenv.isSunOS; # flaky
 
   checkFlags = optionals (!stdenv.hostPlatform.isMusl && versionOlder version "7") [
     # Test is known to fail on various locales on texinfo-6.8: