[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: fish: Add input bc.
From: |
Ludovic Courtès |
Subject: |
01/02: gnu: fish: Add input bc. |
Date: |
Tue, 4 Oct 2016 09:26:49 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit a8d3bc473d2cd285f03989be8f558c25a7cbd6c9
Author: Arun Isaac <address@hidden>
Date: Tue Sep 20 01:35:17 2016 +0530
gnu: fish: Add input bc.
Fixes <http://bugs.gnu.org/24433>.
* gnu/packages/shells.scm (fish)[inputs]: Add bc.
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu/packages/shells.scm | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 272fff7..9114d1d 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)
@@ -95,11 +96,22 @@ 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 file name 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,