ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: fish: Embed full path to Python.

Browse source 
Fixes <https://bugs.gnu.org/25467>.

* gnu/packages/shells.scm (fish)[arguments]: Rename phase "patch-bc" to
"embed-store-paths"; embed full path to Python.
This commit is contained in:
Ricardo Wurmus 2017-01-21 22:57:12 +01:00
parent df05d80ad0
commit 79f3e82bdc
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/shells.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2015 Jeff Mickey <j@codemac.net> ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2016 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -106,14 +107,17 @@ (define-public fish
#:configure-flags '("--sysconfdir=/etc") #:configure-flags '("--sysconfdir=/etc")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; Replace 'bc' by its absolute file name in the store. ;; Embed absolute paths to store items.
(add-after 'unpack 'patch-bc (add-after 'unpack 'embed-store-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* '("share/functions/math.fish" (substitute* '("share/functions/math.fish"
"share/functions/seq.fish") "share/functions/seq.fish")
(("\\| bc") (("\\| bc")
(string-append "| " (assoc-ref %build-inputs "bc") (string-append "| " (assoc-ref %build-inputs "bc")
"/bin/bc")))))))) "/bin/bc")))
(substitute* "share/functions/fish_update_completions.fish"
(("python") (which "python")))
#t)))))
(synopsis "The friendly interactive shell") (synopsis "The friendly interactive shell")
(description (description
"Fish (friendly interactive shell) is a shell focused on interactive use, "Fish (friendly interactive shell) is a shell focused on interactive use,