diff options
author | Brice Waegeneire <brice@waegenei.re> | 2020-02-09 10:11:25 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2020-02-10 01:07:36 +0100 |
commit | df931ac39c40ac8a702e37cb434d9a1016606ed7 (patch) | |
tree | d07ef938d174e35ca902a0c40d0b9973ac2013cb | |
parent | 24d9354c8002f2e7aa02ab85b5bd151c7ea27d2a (diff) |
gnu: password-store: Install fish and zsh completions.
* gnu/packages/password-utils.scm (password-store)[arguments]: Remove
phase install-shell-completions. Adjust make-flags.
-rw-r--r-- | gnu/packages/password-utils.scm | 15 |
1 files changed, 5 insertions, 10 deletions
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 <jens@zete.tk> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> +;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; ;;; 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 |