From 296551a2e9310d4a030ee49530e9367e73aaeecf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 5 May 2018 23:30:04 +0200 Subject: gnu: man-db: Embed absolute reference to 'preconv'. Fixes . Reported by Tobias Geerinckx-Rice . * gnu/packages/man.scm (man-db)[arguments]: Rename 'patch-iconv-path' to 'patch-absolute-paths'. Add substitution for "preconv". --- gnu/packages/man.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index ca6fd351d5..334ebe2906 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,11 +81,19 @@ a flexible and convenient way.") (string-append "#!" (which "sh"))))) (remove file-is-directory? (find-files "src/tests" ".*")))))) - (add-after 'unpack 'patch-iconv-path + (add-after 'unpack 'patch-absolute-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/man.c" (("\"iconv\"") (string-append "\"" (which "iconv") "\""))) + ;; Embed an absolute reference to "preconv", otherwise it + ;; falls back to searching in PATH and ultimately fails + ;; to render unicode data (see ). + (substitute* "lib/encodings.c" + (("groff_preconv = NULL") + (string-append "groff_preconv = \"" + (assoc-ref inputs "groff-minimal") + "/bin/preconv\""))) #t))) #:configure-flags (let ((groff (assoc-ref %build-inputs "groff")) -- cgit v1.2.3