01/01: gnu: password-store: Wrap PATH.

[Mathieu Lirzin]

mthl pushed a commit to branch master
in repository guix.

commit 61201e46a72b715e1a38ce56932c3f4f2d3885b4
Author: Alex Griffin <address@hidden>
Date:   Thu Jul 28 19:06:10 2016 -0500

    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 <address@hidden>
---
 gnu/packages/password-utils.scm |   38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index a03214a..7a8bdcb 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2016 Jessica Tallon <address@hidden>
 ;;; Copyright © 2016 Andreas Enge <address@hidden>
 ;;; Copyright © 2016 Lukas Gradl <address@hidden>
+;;; Copyright © 2016 Alex Griffin <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -266,27 +267,26 @@ any X11 window.")
      '(#:phases
        (modify-phases %standard-phases
          (delete 'configure)
-         (add-after
-          ;; 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)
-            (let ((getopt (string-append (assoc-ref inputs "getopt")
-                                         "/bin/getopt")))
-              (substitute* "src/password-store.sh"
-                (("GETOPT=\"getopt\"")
-                 (string-append "GETOPT=\"" getopt "\"")))
-              #t))))
+         (add-after 'install 'wrap-path
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (path (map (lambda (pkg)
+                                (string-append (assoc-ref inputs pkg) "/bin"))
+                              '("coreutils" "getopt" "git" "gnupg" "pwgen"
+                                "sed" "tree" "which" "xclip"))))
+               (wrap-program (string-append out "/bin/pass")
+                 `("PATH" ":" prefix (,(string-join path ":"))))))))
        #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output))
        #:test-target "test"))
-    (native-inputs `(("getopt" ,util-linux))) ; getopt for the tests
-    (inputs `(("gnupg" ,gnupg)
-              ("pwgen" ,pwgen)
-              ("xclip" ,xclip)
-              ("git" ,git)
-              ("tree" ,tree)
-              ("which" ,which)))
+    (inputs
+     `(("getopt" ,util-linux)
+       ("git" ,git)
+       ("gnupg" ,gnupg)
+       ("pwgen" ,pwgen)
+       ("sed" ,sed)
+       ("tree" ,tree)
+       ("which" ,which)
+       ("xclip" ,xclip)))
     (home-page "http://www.passwordstore.org/";)
     (synopsis "Encrypted password manager")
     (description "Password-store is a password manager which uses GnuPG to