all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* bug#26792: Fix output of --help in package fish
@ 2017-05-06  0:56 ng0
       [not found] ` <handler.26792.B.149403223818956.ack@debbugs.gnu.org>
  2017-05-06 13:53 ` bug#26792: Fix output of --help in package fish Ludovic Courtès
  0 siblings, 2 replies; 5+ messages in thread
From: ng0 @ 2017-05-06  0:56 UTC (permalink / raw)
  To: 26792

[-- 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


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-05-06 13:54 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-06  0:56 bug#26792: Fix output of --help in package fish ng0
     [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

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.