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

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit ccb15b343e35d76a5c7c693f4c00d3f5b5a4cc39
Author: Marius Bakke <address@hidden>
Date:   Sun May 6 23:55:50 2018 +0200

    Revert "gnu: man-db: Embed absolute reference to 'preconv'."
    
    This change broke `man` when invoked outside a `guix environment`.
    
    This reverts commit 296551a2e9310d4a030ee49530e9367e73aaeecf.
---
 gnu/packages/man.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
index 334ebe2..ca6fd35 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -5,7 +5,6 @@
 ;;; Copyright © 2015 Alex Kost <address@hidden>
 ;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
-;;; Copyright © 2018 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -81,19 +80,11 @@ a flexible and convenient way.")
                               (string-append "#!" (which "sh")))))
                          (remove file-is-directory?
                                  (find-files "src/tests" ".*"))))))
-         (add-after 'unpack 'patch-absolute-paths
+         (add-after 'unpack 'patch-iconv-path
            (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"))