nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: password-store: Wrap PATH. 

* gnu/packages/password-utils.scm (password-store)
[arguments]: Wrap PATH more thoroughly.
[native-inputs]: Move getopt to inputs.
[inputs]: Add sed.

Signed-off-by: Mathieu Lirzin <mthl@gnu.org>
This commit is contained in:
Alex Griffin 2016-07-28 19:06:10 -05:00 committed by Mathieu Lirzin
parent f33e71fca2
commit 61201e46a7
No known key found for this signature in database
GPG Key ID: 0ADEE10094604D37
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnu/packages/password-utils.scm
View File

@ -6,6 +6,7 @@
;;; Copyright © 2016 Jessica Tallon <tsyesika@tsyesika.se> ;;; Copyright © 2016 Jessica Tallon <tsyesika@tsyesika.se>
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -266,27 +267,26 @@ any X11 window.")
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-after (add-after 'install 'wrap-path
;; The script requires 'getopt' at run-time, and this allows
;; the user to not install the providing package 'util-linux'
;; in their profile.
'unpack 'patch-path
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((getopt (string-append (assoc-ref inputs "getopt") (let ((out (assoc-ref outputs "out"))
"/bin/getopt"))) (path (map (lambda (pkg)
(substitute* "src/password-store.sh" (string-append (assoc-ref inputs pkg) "/bin"))
(("GETOPT=\"getopt\"") '("coreutils" "getopt" "git" "gnupg" "pwgen"
(string-append "GETOPT=\"" getopt "\""))) "sed" "tree" "which" "xclip"))))
#t)))) (wrap-program (string-append out "/bin/pass")
`("PATH" ":" prefix (,(string-join path ":"))))))))
#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output))
#:test-target "test")) #:test-target "test"))
(native-inputs `(("getopt" ,util-linux))) ; getopt for the tests (inputs
(inputs `(("gnupg" ,gnupg) `(("getopt" ,util-linux)
("pwgen" ,pwgen)
("xclip" ,xclip)
("git" ,git) ("git" ,git)
("gnupg" ,gnupg)
("pwgen" ,pwgen)
("sed" ,sed)
("tree" ,tree) ("tree" ,tree)
("which" ,which))) ("which" ,which)
("xclip" ,xclip)))
(home-page "http://www.passwordstore.org/") (home-page "http://www.passwordstore.org/")
(synopsis "Encrypted password manager") (synopsis "Encrypted password manager")
(description "Password-store is a password manager which uses GnuPG to (description "Password-store is a password manager which uses GnuPG to