me
/
guix
Archived
1
0
Fork 0
Code

gnu: password-store: Remove input labels. 

* gnu/packages/password-utils.scm (password-store)[inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-FILE instead of labels.  Remove trailing #t's.
Marius Bakke 2022-01-15 15:13:19 +01:00
parent bd4f314bba
commit 1e20aec1f8
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@
;;; Copyright © 2017, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net> ;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;; Copyright © 2018 Thomas Sigurdsen <tonton@riseup.net> ;;; Copyright © 2018 Thomas Sigurdsen <tonton@riseup.net>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@ -502,8 +502,7 @@ any X11 window.")
(string-append " SYSTEM_EXTENSION_DIR=\"" (string-append " SYSTEM_EXTENSION_DIR=\""
"${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-" "${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-"
extension-dir extension-dir
"}\"\n")))) "}\"\n"))))))
#t))
(add-before 'install 'patch-passmenu-path (add-before 'install 'patch-passmenu-path
;; FIXME Wayland support requires ydotool and dmenu-wl packages ;; FIXME Wayland support requires ydotool and dmenu-wl packages
;; We are ignoring part of the script that gets executed if ;; We are ignoring part of the script that gets executed if
@ -522,18 +521,18 @@ any X11 window.")
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))) (bin (string-append out "/bin")))
(install-file "contrib/dmenu/passmenu" bin) (install-file "contrib/dmenu/passmenu" bin))))
#t)))
(add-after 'install 'wrap-path (add-after 'install 'wrap-path
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(path (map (lambda (pkg) (requisites '("getopt" "git" "gpg" "qrencode" "sed"
(string-append (assoc-ref inputs pkg) "/bin")) "tree" "which" "wl-copy" "xclip"))
'("coreutils" "getopt" "git" "gnupg" "qrencode" (path (map (lambda (pkg)
"sed" "tree" "which" "wl-clipboard" "xclip")))) (dirname (search-input-file
inputs (string-append "/bin/" pkg))))
requisites)))
(wrap-program (string-append out "/bin/pass") (wrap-program (string-append out "/bin/pass")
`("PATH" ":" prefix (,(string-join path ":")))) `("PATH" ":" prefix (,(string-join path ":"))))))))
#t))))
#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output) #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)
"WITH_ALLCOMP=yes" "WITH_ALLCOMP=yes"
(string-append "BASHCOMPDIR=" (string-append "BASHCOMPDIR="
@ -548,17 +547,17 @@ any X11 window.")
(separator #f) ;single entry (separator #f) ;single entry
(files '("lib/password-store/extensions"))))) (files '("lib/password-store/extensions")))))
(inputs (inputs
`(("dmenu" ,dmenu) (list dmenu
("getopt" ,util-linux) util-linux
("git" ,git) git
("gnupg" ,gnupg) gnupg
("qrencode" ,qrencode) qrencode
("sed" ,sed) sed
("tree" ,tree) tree
("which" ,which) which
("wl-clipboard" ,wl-clipboard) wl-clipboard
("xclip" ,xclip) xclip
("xdotool" ,xdotool))) xdotool))
(home-page "https://www.passwordstore.org/") (home-page "https://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