[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: password-store: Allow external packages to provide extension
From: |
guix-commits |
Subject: |
01/02: gnu: password-store: Allow external packages to provide extensions. |
Date: |
Mon, 22 Apr 2019 05:29:45 -0400 (EDT) |
cbaines pushed a commit to branch master
in repository guix.
commit 555415564964d82d36db8ee63c00c5d178691830
Author: Alex Griffin <address@hidden>
Date: Sat Apr 20 11:56:23 2019 -0500
gnu: password-store: Allow external packages to provide extensions.
* gnu/packages/password-utils.scm (password-store): Add mechanism for
providing pass extensions in separate packages.
[arguments]: Add patch-system-extension-dir phase.
[native-search-paths]: Add PASSWORD_STORE_SYSTEM_EXTENSION_DIR.
Signed-off-by: Christopher Baines <address@hidden>
---
gnu/packages/password-utils.scm | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 5c11d8c..8c5f3dd 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -6,7 +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>
+;;; Copyright © 2016, 2019 Alex Griffin <address@hidden>
;;; Copyright © 2017 Leo Famulari <address@hidden>
;;; Copyright © 2017, 2018 Clément Lassieur <address@hidden>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
@@ -423,6 +423,19 @@ any X11 window.")
(modify-phases %standard-phases
(delete 'configure)
(delete 'build)
+ (add-before 'install 'patch-system-extension-dir
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (extension-dir (string-append out
"/lib/password-store/extensions")))
+ (substitute* "src/password-store.sh"
+ (("^SYSTEM_EXTENSION_DIR=.*$")
+ ;; lead with whitespace to prevent 'make install' from
+ ;; overwriting it again
+ (string-append " SYSTEM_EXTENSION_DIR=\""
+ "${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-"
+ extension-dir
+ "}\"\n"))))
+ #t))
(add-before 'install 'patch-passmenu-path
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "contrib/dmenu/passmenu"
@@ -461,6 +474,10 @@ any X11 window.")
;; timeout in some circumstances.
#:parallel-tests? #f
#:test-target "test"))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "PASSWORD_STORE_SYSTEM_EXTENSION_DIR")
+ (files '("lib/password-store/extensions")))))
(inputs
`(("dmenu" ,dmenu)
("getopt" ,util-linux)