ng0 <contact....@cryptolab.net> writes: > FYI: > The script which fails is the one which generates completions > from man pages. As our location of manpages differs, we need some > approach to patch this.
I don’t think this is true. Fish seems to fail to find “python”. The error disappears in an environment where “python-wrapper” is available. A fix would involve replacing the call to “python” with the full path to the “python” executable. Here’s a patch:
>From dbc045eb338b7e70645ed19be71d8e761762c738 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus <rek...@elephly.net> Date: Sat, 21 Jan 2017 22:57:12 +0100 Subject: [PATCH] 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(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 5237e8120..16c76ef66 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 <m...@tobias.gr> ;;; Copyright © 2016 Stefan Reichör <ste...@xsteve.at> +;;; Copyright © 2017 Ricardo Wurmus <rek...@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, -- 2.11.0
-- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net
