summaryrefslogtreecommitdiff
path: root/gnu/packages/terminals.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-10-12 16:50:47 +0000
committerMathieu Othacehe <othacehe@gnu.org>2021-10-12 17:46:23 +0000
commita1eca979fb8da842e73c42f4f53be29b169810f2 (patch)
tree681c7283e412bb8a29c2531c4408b49c3e184764 /gnu/packages/terminals.scm
parent48d86a9ec6d8d2e97da2299ea41a03ef4cdaab83 (diff)
parent371aa5777a3805a3886f3feea5f1960fe3fe4219 (diff)
downloadguix-patches-a1eca979fb8da842e73c42f4f53be29b169810f2.tar
guix-patches-a1eca979fb8da842e73c42f4f53be29b169810f2.tar.gz
Merge remote-tracking branch 'origin/master' into core-updates-frozen.
Diffstat (limited to 'gnu/packages/terminals.scm')
-rw-r--r--gnu/packages/terminals.scm9
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index d4464f8f9e..785f05a8c4 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -27,6 +27,7 @@
;;; Copyright © 2021 Raphaël Mélotte <raphael.melotte@mind.be>
;;; Copyright © 2021 ikasero <ahmed@ikasero.com>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -876,7 +877,8 @@ usable with any list--including files, command history, processes and more.")
(arguments
(ensure-keyword-arguments
(package-arguments go-github-com-junegunn-fzf)
- `(#:phases
+ `(#:install-source? #f
+ #:phases
(modify-phases %standard-phases
(add-after 'install 'copy-binaries
(lambda* (#:key outputs #:allow-other-keys)
@@ -894,11 +896,16 @@ usable with any list--including files, command history, processes and more.")
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bash-completion (string-append out "/etc/bash_completion.d"))
+ (fish-functions
+ (string-append out "/share/fish/vendor_functions.d"))
(zsh-completion (string-append out "/share/zsh/site-functions")))
(with-directory-excursion "src/github.com/junegunn/fzf"
(mkdir-p bash-completion)
(copy-file "shell/completion.bash"
(string-append bash-completion "/fzf"))
+ (mkdir-p fish-functions)
+ (copy-file "shell/key-bindings.fish"
+ (string-append fish-functions "/fzf_key_bindings.fish"))
(mkdir-p zsh-completion)
(copy-file "shell/completion.zsh"
(string-append zsh-completion "/_fzf"))))))))))