all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: ng0 <ng0@pragmatique.xyz>
To: 26792@debbugs.gnu.org
Subject: bug#26792: Fix output of --help in package fish
Date: Sat, 6 May 2017 00:56:54 +0000	[thread overview]
Message-ID: <20170506005654.6fmz6ojzieve7mnv@abyayala> (raw)

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

Currently the output of fish --help fails if the nroff binary is not found.
The patch fixes the issue by embeding a reference to the groff provided nroff,
fish --help produces correct output after this is applied.
-- 
https://pragmatique.xyz
PGP: https://people.pragmatique.xyz/ng0/

[-- Attachment #2: 0001-gnu-fish-Reference-groff-to-fix-output-of-fish-help.patch --]
[-- Type: text/plain, Size: 1751 bytes --]

From 5a22ffdccef3266f6a4050f715f304c10c259ba3 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@no-reply.pragmatique.xyz>
Date: Sat, 6 May 2017 00:12:58 +0000
Subject: [PATCH] gnu: fish: Reference 'groff' to fix output of 'fish --help'.

* gnu/packages/shells.scm (fish)[native-inputs]: Add 'groff'.
(arguments): Add 'nroff' substitution in 'embed-store-paths' phase.
---
 gnu/packages/shells.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index d87d58e5c..6f06acfa4 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages groff)
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pcre)
@@ -112,7 +113,8 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
                   ((".*INSTALL.*sysconfdir.*fish.*") "")))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("doxygen" ,doxygen)))
+     `(("doxygen" ,doxygen)
+       ("groff" ,groff)))
     (inputs
      `(("bc" ,bc)
        ("ncurses" ,ncurses)
@@ -133,6 +135,8 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
                                "/bin/bc")))
              (substitute* "share/functions/fish_update_completions.fish"
                (("python") (which "python")))
+             (substitute* "share/functions/__fish_print_help.fish"
+               (("nroff") (which "nroff")))
              #t)))))
     (synopsis "The friendly interactive shell")
     (description
-- 
2.12.2


             reply	other threads:[~2017-05-06  0:58 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-06  0:56 ng0 [this message]
     [not found] ` <handler.26792.B.149403223818956.ack@debbugs.gnu.org>
2017-05-06 10:44   ` bug#26792: Acknowledgement (Fix output of --help in package fish) ng0
2017-05-06 11:03     ` ng0
2017-05-06 11:36       ` ng0
2017-05-06 13:53 ` bug#26792: Fix output of --help in package fish Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170506005654.6fmz6ojzieve7mnv@abyayala \
    --to=ng0@pragmatique.xyz \
    --cc=26792@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.