From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:58851) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1it9wu-0002uR-Gb for guix-patches@gnu.org; Sun, 19 Jan 2020 07:45:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1it9wt-0003qv-77 for guix-patches@gnu.org; Sun, 19 Jan 2020 07:45:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36754) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1it9wt-0003qn-3r for guix-patches@gnu.org; Sun, 19 Jan 2020 07:45:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1it9wt-0000hh-2x for guix-patches@gnu.org; Sun, 19 Jan 2020 07:45:03 -0500 Subject: [bug#39192] [PATCH] gnu: hexedit: Make F1 help more reliable Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:58832) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1it9wU-0002sJ-QC for guix-patches@gnu.org; Sun, 19 Jan 2020 07:44:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1it9wT-0003hb-Ox for guix-patches@gnu.org; Sun, 19 Jan 2020 07:44:38 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:50368) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1it9wT-0003hG-FZ for guix-patches@gnu.org; Sun, 19 Jan 2020 07:44:37 -0500 Date: Sun, 19 Jan 2020 13:44:34 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200119124434.aatfpdm6ihiig354@zdrowyportier.kadziolka.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39192@debbugs.gnu.org * gnu/packages/hexedit.scm (hexedit)[arguments](patch-man-path): New phase. [inputs]: Add MAN-DB. --- gnu/packages/hexedit.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm index 39dcb2e0f7..e788c7f766 100644 --- a/gnu/packages/hexedit.scm +++ b/gnu/packages/hexedit.scm @@ -24,6 +24,7 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) + #:use-module (gnu packages man) #:use-module (gnu packages ncurses) #:use-module (guix download) #:use-module (guix git-download) @@ -43,12 +44,24 @@ (base32 "1xsxa5mip892jkvz9jshj73y6c7j3mgp8y393ciihqlyf2nmfs67")))) (build-system gnu-build-system) - (arguments '(#:tests? #f)) ; no check target + (arguments + `(#:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + ;; Make F1 open the man page even if man-db is not in the profile + (add-after 'unpack 'patch-man-path + (lambda _ + (substitute* "interact.c" + (("\"man\"") + (string-append "\"" (assoc-ref %build-inputs "man-db") "/bin/man\"")) + (("\"hexedit\"") + (string-append "\"" (assoc-ref %outputs "out") "/share/man/man1/hexedit.1.gz\"")))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake))) (inputs - `(("ncurses" ,ncurses))) + `(("ncurses" ,ncurses) + ("man-db" ,man-db))) (synopsis "View and edit files or devices in hexadecimal or ASCII") (description "hexedit shows a file both in ASCII and in hexadecimal. The file can be a device as the file is read a piece at a time. You can modify -- 2.25.0