From df931ac39c40ac8a702e37cb434d9a1016606ed7 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 9 Feb 2020 10:11:25 +0100 Subject: gnu: password-store: Install fish and zsh completions. * gnu/packages/password-utils.scm (password-store)[arguments]: Remove phase install-shell-completions. Adjust make-flags. --- gnu/packages/password-utils.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 8d74490d23..1e93e5d9ad 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -497,17 +498,11 @@ any X11 window.") "sed" "tree" "which" "xclip")))) (wrap-program (string-append out "/bin/pass") `("PATH" ":" prefix (,(string-join path ":")))) - #t))) - (add-after 'wrap-path 'install-shell-completions - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bashcomp (string-append out "/etc/bash_completion.d"))) - ;; TODO: install fish and zsh completions. - (mkdir-p bashcomp) - (copy-file "src/completion/pass.bash-completion" - (string-append bashcomp "/pass")) #t)))) - #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) + #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output) + "WITH_ALLCOMP=yes" + (string-append "BASHCOMPDIR=" + %output "/etc/bash_completion.d")) ;; Parallel tests may cause a race condition leading to a ;; timeout in some circumstances. #:parallel-tests? #f -- cgit 1.4.1