all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* PATCH for bug#24433
@ 2016-09-19 20:05 Arun Isaac
  2016-09-19 20:05 ` [PATCH] gnu: fish: Add input bc Arun Isaac
  0 siblings, 1 reply; 2+ messages in thread
From: Arun Isaac @ 2016-09-19 20:05 UTC (permalink / raw)
  To: guix-devel


This is the fix for bug#24433. I'm not sure if I should be sending this to
this list. I already sent it to 24433@debbugs.gnu.org, but I was wondering if
it was somehow missed.

Thanks,
Arun Isaac.

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

* [PATCH] gnu: fish: Add input bc.
  2016-09-19 20:05 PATCH for bug#24433 Arun Isaac
@ 2016-09-19 20:05 ` Arun Isaac
  0 siblings, 0 replies; 2+ messages in thread
From: Arun Isaac @ 2016-09-19 20:05 UTC (permalink / raw)
  To: guix-devel

* 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

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

end of thread, other threads:[~2016-09-19 20:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-19 20:05 PATCH for bug#24433 Arun Isaac
2016-09-19 20:05 ` [PATCH] gnu: fish: Add input bc Arun Isaac

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.