diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /doc/build.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'doc/build.scm')
| -rw-r--r-- | doc/build.scm | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/doc/build.scm b/doc/build.scm index e96df1991f..1d086b83ac 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -51,7 +51,16 @@ (@@ (guix self) file-append*)) (define translated-texi-manuals - (@@ (guix self) translate-texi-manuals)) + (let ((translated (@@ (guix self) translate-texi-manuals))) + (lambda (source) + (let ((result (translated source))) + ;; Build with 'guile-3.0-latest', which is linked against + ;; 'libgc/disable-munmap', to avoid the dreaded "mmap(PROT_NONE) + ;; failed" crash: <https://bugs.gnu.org/47428>. + (computed-file (computed-file-name result) + (computed-file-gexp result) + #:options (computed-file-options result) + #:guile guile-3.0-latest))))) (define info-manual (@@ (guix self) info-manual)) @@ -63,9 +72,9 @@ "guix")) (define %languages - ;; The cookbook is currently only translated into German. + ;; The cookbook is not translated in the same languages as the manual (if (string=? %manual "guix-cookbook") - '("de" "en") + '("de" "en" "fr") '("de" "en" "es" "fr" "ru" "zh_CN"))) (define (texinfo-manual-images source) @@ -948,7 +957,7 @@ from SOURCE." (div (ul (li (a (@ (href "html_node")) - "HTML, with one page per node")) + "HTML, with a separate page per node")) (li (a (@ (href ,(string-append #$manual |