From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arun Isaac Subject: bug#24433: [PATCH] gnu: fish: Add input bc. Date: Sat, 17 Sep 2016 02:30:55 +0530 Message-ID: <20160916210055.10442-2-arunisaac@systemreboot.net> References: <20160916210055.10442-1-arunisaac@systemreboot.net> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bl0Gr-0000Tu-MI for bug-guix@gnu.org; Fri, 16 Sep 2016 17:02:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bl0Go-00019w-R0 for bug-guix@gnu.org; Fri, 16 Sep 2016 17:02:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35877) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bl0Go-00019m-Nl for bug-guix@gnu.org; Fri, 16 Sep 2016 17:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bl0Go-0001tP-EQ for bug-guix@gnu.org; Fri, 16 Sep 2016 17:02:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20160916210055.10442-1-arunisaac@systemreboot.net> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: 24433@debbugs.gnu.org * 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