From patchwork Sun Jan 19 12:44:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 19914 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3314417A3B; Sun, 19 Jan 2020 12:45:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,RCVD_NUMERIC_HELO autolearn=no autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id EAB6D17A34 for ; Sun, 19 Jan 2020 12:45:12 +0000 (GMT) Received: from localhost ([::1]:49800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1it9x1-0002ul-UQ for patchwork@mira.cbaines.net; Sun, 19 Jan 2020 07:45:11 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#39192] [PATCH] gnu: hexedit: Make F1 help more reliable Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Jan 2020 12:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39192 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39192@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15794378812643 (code B ref -1); Sun, 19 Jan 2020 12:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Jan 2020 12:44:41 +0000 Received: from localhost ([127.0.0.1]:42725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1it9wX-0000gY-5u for submit@debbugs.gnu.org; Sun, 19 Jan 2020 07:44:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:57369) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1it9wW-0000gR-2K for submit@debbugs.gnu.org; Sun, 19 Jan 2020 07:44:40 -0500 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 Received: (qmail 10316 invoked by uid 1009); 19 Jan 2020 13:44:36 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25699. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.0086 secs); 19 Jan 2020 12:44:36 -0000 Received: from unknown (HELO zdrowyportier.kadziolka.net) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 19 Jan 2020 13:44:36 +0100 Date: Sun, 19 Jan 2020 13:44:34 +0100 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Message-ID: <20200119124434.aatfpdm6ihiig354@zdrowyportier.kadziolka.net> MIME-Version: 1.0 Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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