From 79f3e82bdce9f3e4feeeeee75f40d24cad6e4b2b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Jan 2017 22:57:12 +0100
Subject: gnu: fish: Embed full path to Python.

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.
---
 gnu/packages/shells.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 5237e81206..16c76ef661 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 Stefan Reichör <stefan@xsteve.at>
+;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -106,14 +107,17 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
        #:configure-flags '("--sysconfdir=/etc")
        #:phases
        (modify-phases %standard-phases
-         ;; Replace 'bc' by its absolute file name in the store.
-         (add-after 'unpack 'patch-bc
+         ;; Embed absolute paths to store items.
+         (add-after 'unpack 'embed-store-paths
            (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"))))))))
+                               "/bin/bc")))
+             (substitute* "share/functions/fish_update_completions.fish"
+               (("python") (which "python")))
+             #t)))))
     (synopsis "The friendly interactive shell")
     (description
      "Fish (friendly interactive shell) is a shell focused on interactive use,
-- 
cgit v1.2.3

e</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=99bcae94bcd50fc15bf44b5cc06cd39450f01ad5'>root</a>/<a href='/guix/log/gnu?id=99bcae94bcd50fc15bf44b5cc06cd39450f01ad5'>gnu</a>/<a href='/guix/log/gnu/packages?id=99bcae94bcd50fc15bf44b5cc06cd39450f01ad5'>packages</a>/<a href='/guix/log/gnu/packages/storage.scm?id=99bcae94bcd50fc15bf44b5cc06cd39450f01ad5'>storage.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/storage.scm?id=99bcae94bcd50fc15bf44b5cc06cd39450f01ad5&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-03-30 22:32:36 +0200'>2017-03-30</span></td><td><a href='/guix/commit/gnu/packages/storage.scm?id=c3c25082e820fc3e376a757a48124924b92d816a'>gnu: ceph: Update to 12.0.1.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2017-03-28 16:35:37 +0200'>2017-03-28</span></td><td><a href='/guix/commit/gnu/packages/storage.scm?id=dcfe44cbce97e887d033b6adefd7669f47c36e4f'>gnu: Add ceph.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>