diff options
| author | ( via Guix-patches via <guix-patches@gnu.org> | 2022-10-09 17:57:48 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2022-10-10 17:55:18 +0200 |
| commit | 0bb5a235c363956907ac4a6bb817d3556ff0e8c4 (patch) | |
| tree | f8cde10d4f0993a7c177a484d7644d13db02817b | |
| parent | fd024ba0f5d51dedb8550213104bc967df07eed6 (diff) | |
| download | guix-0bb5a235c363956907ac4a6bb817d3556ff0e8c4.tar guix-0bb5a235c363956907ac4a6bb817d3556ff0e8c4.tar.gz | |
gnu: emacs-password-store: Refer directly to password-store.
* gnu/packages/emacs-xyz.scm (emacs-password-store)[arguments]:
Use gexp style.
<#:phases>{'extract-el-file}: New phase.
[propagated-inputs]<password-store>: Move it...
[inputs]: ...here.
Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d8a21fd41f..f3b8fed991 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18918,24 +18918,31 @@ close, copy, cut, paste, undo, redo.") (uri (git-reference (url "git://git.zx2c4.com/password-store") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 - "0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi")) - (file-name (git-file-name name version)))) + "0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'extract-el-file - (lambda _ - (copy-file "contrib/emacs/password-store.el" "password-store.el") - (delete-file-recursively "contrib") - (delete-file-recursively "man") - (delete-file-recursively "src") - (delete-file-recursively "tests")))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'extract-el-file + (lambda _ + (copy-file "contrib/emacs/password-store.el" + "password-store.el") + (delete-file-recursively "contrib") + (delete-file-recursively "man") + (delete-file-recursively "src") + (delete-file-recursively "tests"))) + (add-after 'extract-el-file 'patch-executables + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-variables "password-store.el" + ("password-store-executable" + (search-input-file inputs "/bin/pass")))))))) + (inputs + (list password-store)) (propagated-inputs - (list emacs-auth-source-pass emacs-s emacs-with-editor - password-store)) + (list emacs-auth-source-pass emacs-s emacs-with-editor)) (home-page "https://git.zx2c4.com/password-store/tree/contrib/emacs") (synopsis "Password store (pass) support for Emacs") (description |