unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: Arun Isaac <arunisaac@systemreboot.net>
To: 24433@debbugs.gnu.org
Subject: bug#24433: [PATCH] gnu: fish: Add input bc.
Date: Sat, 17 Sep 2016 02:30:55 +0530	[thread overview]
Message-ID: <20160916210055.10442-2-arunisaac@systemreboot.net> (raw)
In-Reply-To: <20160916210055.10442-1-arunisaac@systemreboot.net>

* gnu/packages/shells.scm (fish)[inputs]: Add bc.
---
 gnu/packages/shells.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 183ef7f..bc43468 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -22,6 +22,7 @@
 
 (define-module (gnu packages shells)
   #:use-module (gnu packages)
+  #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages documentation)
@@ -94,11 +95,21 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
     (native-inputs
      `(("doxygen" ,doxygen)))
     (inputs
-     `(("ncurses" ,ncurses)
+     `(("bc" ,bc)
+       ("ncurses" ,ncurses)
        ("python" ,python-wrapper)))   ;for fish_config and manpage completions
     (arguments
      '(#:tests? #f ; no check target
-       #:configure-flags '("--sysconfdir=/etc")))
+       #:configure-flags '("--sysconfdir=/etc")
+       #:phases
+       (modify-phases %standard-phases
+         ;; Replace bc by its absolute path in the store
+         (add-after 'unpack 'patch-bc
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (substitute* '("share/functions/math.fish"
+                            "share/functions/seq.fish")
+               (("\\| bc") (string-append "| " (assoc-ref %build-inputs "bc")
+                                          "/bin/bc"))))))))
     (synopsis "The friendly interactive shell")
     (description
      "Fish (friendly interactive shell) is a shell focused on interactive use,
-- 
2.10.0

  reply	other threads:[~2016-09-16 21:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-14  8:48 bug#24433: fish needs to have bc in propagated-inputs Arun Isaac
2016-09-14 13:57 ` Thompson, David
2016-09-15  6:23   ` Arun Isaac
2016-09-16 21:00   ` bug#24433: Arun Isaac
2016-09-16 21:00     ` Arun Isaac [this message]
2016-09-25 22:07       ` bug#24433: [PATCH] gnu: fish: Add input bc Arun Isaac
2016-10-04  9:27       ` Ludovic Courtès
2016-10-04 14:19         ` Arun Isaac

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

  List information: https://guix.gnu.org/

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

  git send-email \
    --in-reply-to=20160916210055.10442-2-arunisaac@systemreboot.net \
    --to=arunisaac@systemreboot.net \
    --cc=24433@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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).