01/01: Revert "Revert "gnu: man-db: Embed absolute reference to 'preconv'.""

[guix-commits]

ambrevar pushed a commit to branch master
in repository guix.

commit 073f5f20578f36022748a7692f369214ecf7363a
Author: Marius Bakke <address@hidden>
Date:   Thu Jan 17 12:27:18 2019 +0100

    Revert "Revert "gnu: man-db: Embed absolute reference to 'preconv'.""
    
    This reverts commit ccb15b343e35d76a5c7c693f4c00d3f5b5a4cc39.
    
    Now that we've fixed the segfault with groff's preconv (see
    73b2ce87956b0d9168dcfa234128b91e0e41a4c7), it's safe to re-apply this fix.
---
 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 68d6c16..fbc5ca2 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2018 Rutger Helling <address@hidden>
+;;; Copyright © 2018, 2019 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -82,11 +83,19 @@ a flexible and convenient way.")
                          (remove file-is-directory?
                                  (find-files "src/tests" ".*")))
                #t)))
-         (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 <https://bugs.gnu.org/30785>).
+             (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"))