[bug#66868] [PATCH 0/2] Fix passff-host.

[bug#66868] [PATCH 0/2] Fix passff-host.

[Clément Lassieur]

Here are the patches related to this conversation:
https://lists.gnu.org/archive/html/guix-devel/2023-10/msg00262.html

Thanks

Clément Lassieur (2):
  gnu: password-store: Add missing ‘tail’ input.
  gnu: passff-host: Add explicit references to inputs and remove some.

 gnu/packages/browser-extensions.scm | 40 ++++++++++++++---------------
 gnu/packages/password-utils.scm     |  5 ++--
 2 files changed, 22 insertions(+), 23 deletions(-)


base-commit: 26565f1bc8548011bc0e1b821a9a957db1bc2d8f
-- 
2.41.0

[bug#66868] [PATCH 1/2] gnu: password-store: Add missing ‘tail’ input.

[Clément Lassieur]

* gnu/packages/password-utils.scm (password-store)[arguments]: Add “tail” to
the list of requisites.
[inputs]: Add COREUTILS.

Change-Id: I7f59e6c0abfb5396b9548edaec08d3b0a7c0eb23
---
 gnu/packages/password-utils.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 9558da1dee12..385bd6498577 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -678,7 +678,7 @@ (define-public password-store
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (requisites '("getopt" "git" "gpg" "qrencode" "sed"
-                                  "tree" "which" "wl-copy" "xclip"))
+                                  "tail" "tree" "which" "wl-copy" "xclip"))
                     (path (map (lambda (pkg)
                                  (dirname (search-input-file
                                            inputs (string-append "/bin/" pkg))))
@@ -699,7 +699,8 @@ (define-public password-store
             (separator #f)             ;single entry
             (files '("lib/password-store/extensions")))))
     (inputs
-     (list dmenu
+     (list coreutils
+           dmenu
            util-linux
            git
            gnupg
-- 
2.41.0

[bug#66868] [PATCH 2/2] gnu: passff-host: Add explicit references to inputs and remove some.

[Clément Lassieur]

This removes ‘coreutils’, ‘grep’, ‘sed’, ‘which’, ‘bash-minimal’ and
‘gnu-make’ inputs, which were only used by the Makefile and
install_host_app.sh.  Instead of running install_host_app.sh (through
‘make’) which does a few text substitutions, do the text substitutions with
Scheme code.  This simplifies things and avoids unnecessary native inputs.

* gnu/packages/browser-extensions.scm (passff-host)[build-system]: Change to
copy-build-system.
[arguments]: Copy passff.json and passff.py.  Do text substitutions on
them rather than running make.  Refer to ‘password-store’ and ‘python’ through
inputs rather than directly.
[inputs]: Add PASSWORD-STORE and PYTHON.

Change-Id: I8fdb757516a7c30eae36b15f2a8d91e1445b19a5
---
 gnu/packages/browser-extensions.scm | 40 ++++++++++++++---------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/browser-extensions.scm b/gnu/packages/browser-extensions.scm
index 99dc7de109c3..ea4043f23b47 100644
--- a/gnu/packages/browser-extensions.scm
+++ b/gnu/packages/browser-extensions.scm
@@ -167,28 +167,26 @@ (define-public passff-host
               (sha256
                (base32
                 "1p18l1jh20x4v8dj64z9qjlp96fxsl5h069iynxfpbkzj6hd74yl"))))
-    (build-system trivial-build-system)
+    (build-system copy-build-system)
     (arguments
-     (list
-      #:modules '((guix build utils))
-      #:builder
-      #~(begin
-          (use-modules (guix build utils))
-          (setenv "PATH" (string-join '(#$coreutils
-                                        #$grep
-                                        #$password-store
-                                        #$python
-                                        #$sed
-                                        #$which) "/bin:" 'suffix))
-          (copy-recursively #$source ".")
-          (patch-shebang "src/install_host_app.sh"
-                         (list (in-vicinity #$bash-minimal "bin")))
-          (substitute* "src/install_host_app.sh"
-            (("(TARGET_DIR_FIREFOX=).*" all var)
-             (string-append var #$output "/lib/icecat/native-messaging-hosts"
-                            "\n")))
-          (invoke #$(file-append gnu-make "/bin/make")
-                  (string-append "VERSION=" #$version) "install-unix"))))
+     (let ((native-manifests "lib/icecat/native-messaging-hosts"))
+       (list
+        #:install-plan
+        `'(("src" ,native-manifests #:include ("passff.json" "passff.py")))
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'substitute
+              (lambda _
+                (substitute* "src/passff.json"
+                  (("PLACEHOLDER")
+                   (format #f "~a/~a/passff.py" #$output #$native-manifests)))
+                (substitute* "src/passff.py"
+                  (("_VERSIONHOLDER_") #$version)
+                  (("^COMMAND = .*")
+                   (format #f "COMMAND = \"~a/bin/pass\"~%"
+                           #$(this-package-input "password-store"))))
+                (patch-shebang "src/passff.py")))))))
+    (inputs (list password-store python))
     (synopsis "Host app for the WebExtension PassFF")
     (description "This piece of software wraps around the zx2c4 pass shell
 command.  It has to be installed for the PassFF browser extension to work
-- 
2.41.0

[bug#66868] [PATCH 2/2] gnu: passff-host: Add explicit references to inputs and remove some.

[Clément Lassieur]

I'll also remove some now useless #:use-modules statements.