From b8669aa64ede4de7646e13ccdd396a8f1f877957 Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Tue, 25 May 2021 10:16:50 +0200 Subject: gnu: fzf: Add fish shell functions. * gnu/packages/terminals.scm (fzf)[arguments]: Install fish shell completions. Signed-off-by: Efraim Flashner --- gnu/packages/terminals.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index de9bec9e66..29d4917e31 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2021 Raphaël Mélotte ;;; Copyright © 2021 ikasero ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2021 Solene Rapenne ;;; ;;; This file is part of GNU Guix. ;;; @@ -895,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-completion + (string-append out "/share/fish/vendor_completions.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-completion) + (copy-file "shell/key-bindings.fish" + (string-append fish-completion "/fzf.fish")) (mkdir-p zsh-completion) (copy-file "shell/completion.zsh" (string-append zsh-completion "/_fzf")))))))))) -- cgit v1.2.3 From 8c6c33a2a5bf385e1589b405ee7f842684ed80c1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 26 Sep 2021 15:00:13 +0300 Subject: gnu: fzf: Don't install source. * gnu/packages/terminals.scm (fzf)[arguments]: Add keyword to not install sourcecode. --- gnu/packages/terminals.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 29d4917e31..85bca58bca 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -878,7 +878,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) -- cgit v1.2.3 From b3fd8dafb0a6d0d43ef6a2075bd8cce5e41ea6f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Oct 2021 14:57:29 +0300 Subject: gnu: fzf: Fix fish functions location. Reported by wp1148917-web . * gnu/packages/terminals.scm (fzf)[arguments]: Adjust 'install-completions phase to install the fish vendor functions into the correct location. --- gnu/packages/terminals.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 85bca58bca..637ddb7264 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -897,16 +897,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-completion - (string-append out "/share/fish/vendor_completions.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-completion) + (mkdir-p fish-functions) (copy-file "shell/key-bindings.fish" - (string-append fish-completion "/fzf.fish")) + (string-append fish-functions "/fzf_key_bindings.fish")) (mkdir-p zsh-completion) (copy-file "shell/completion.zsh" (string-append zsh-completion "/_fzf")))))))))) -- cgit v1.2.3