about summary refs log tree commit diff
path: root/pkgs/misc/solfege
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2020-09-18 10:19:42 +0000
committerOrivej Desh <orivej@gmx.fr>2020-09-18 10:21:24 +0000
commit19f7f150a4ab1ff3a1583cc173ff10bcc224ffb2 (patch)
tree8cec52f7a64f2d6a230dfc36d7092c73d8b21507 /pkgs/misc/solfege
parent0c1807e3e22c15e351b5a9319de4988a767b5866 (diff)
solfege: fix build with texinfo 6.7
makeinfo seems right to fail when input encoding is not declared and is not UTF-8.

texinfo was updated in #95910.
Diffstat (limited to 'pkgs/misc/solfege')
-rw-r--r--pkgs/misc/solfege/default.nix1
-rw-r--r--pkgs/misc/solfege/texinfo.patch20
2 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix
index 05e13f3c9aaee..21615b0c2b655 100644
--- a/pkgs/misc/solfege/default.nix
+++ b/pkgs/misc/solfege/default.nix
@@ -15,6 +15,7 @@ buildPythonApplication rec {
   patches = [
     ./css.patch
     ./menubar.patch
+    ./texinfo.patch
     ./webbrowser.patch
   ];
 
diff --git a/pkgs/misc/solfege/texinfo.patch b/pkgs/misc/solfege/texinfo.patch
new file mode 100644
index 0000000000000..d681b3e901bd8
--- /dev/null
+++ b/pkgs/misc/solfege/texinfo.patch
@@ -0,0 +1,20 @@
+Fix build with texinfo 6.7. Otherwise
+
+    makeinfo -I topdocs --no-split --no-headers --output AUTHORS topdocs/AUTHORS.texi
+
+fails with
+
+    utf8 "\xC1" does not map to Unicode at /nix/store/...-texinfo-6.7/share/texinfo/Texinfo/ParserNonXS.pm line 1796, <FH> line 38.
+
+--- a/topdocs/AUTHORS.texi
++++ b/topdocs/AUTHORS.texi
+@@ -1,2 +1,3 @@
+ \input texinfo
++@documentencoding ISO-8859-1
+ @setfilename AUTHORS.info
+--- a/topdocs/README.texi
++++ b/topdocs/README.texi
+@@ -1,2 +1,3 @@
+ \input texinfo
++@documentencoding ISO-8859-1
+ @setfilename README.info