branch wip-emacs updated: gnu: emacs-edbi: Adjust to changes in emacs-build-system.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

leoprikler pushed a commit to branch wip-emacs
in repository guix.

The following commit(s) were added to refs/heads/wip-emacs by this push:
     new 74d0c73  gnu: emacs-edbi: Adjust to changes in emacs-build-system.
74d0c73 is described below

commit 74d0c7342517d3d8c65e17ee092718492f11d8d8
Author: Leo Prikler <leo.prikler@student.tugraz.at>
AuthorDate: Sun Apr 4 14:57:03 2021 +0200

    gnu: emacs-edbi: Adjust to changes in emacs-build-system.
    
    * gnu/packages/emacs-xyz.scm (emacs-edbi)[patch-path]: Execute after unpack.
    [wrap-edbi-bridge]: New phase (after wrap).  Use find-files to locate
    edbi-bridge.
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ce0651d..bf4eb5d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -21422,17 +21422,22 @@ asynchronous communications, the RPC response is 
fairly good.")
        `(#:include '("\\.el$" "\\.pl$")
          #:phases
          (modify-phases %standard-phases
-           (add-after 'install 'patch-path
-             (lambda* (#:key inputs outputs #:allow-other-keys)
-               (let ((perl (assoc-ref inputs "perl"))
-                     (dir (string-append  (assoc-ref outputs "out")
-                                          "/share/emacs/site-lisp")))
-                 (substitute* (string-append dir  "/edbi.el")
+           (add-after 'unpack 'patch-path
+             (lambda* (#:key inputs #:allow-other-keys)
+               (let ((perl (assoc-ref inputs "perl")))
+                 (substitute* "edbi.el"
                    (("\"perl\"") (string-append "\"" perl "/bin/perl\"")))
-                 (chmod (string-append dir "/edbi-bridge.pl") #o555)
-                 (wrap-program (string-append dir "/edbi-bridge.pl")
-                   `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))
-                 #t))))))
+                 #t)))
+           (add-after 'wrap 'wrap-edbi-bridge
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (for-each
+                (lambda (bridge)
+                  (chmod bridge #o555)
+                  (wrap-program bridge
+                    `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))))
+                (find-files (assoc-ref outputs "out")
+                            "^edbi-bridge\\.pl$"))
+               #t)))))
       (synopsis "Database Interface for Emacs Lisp")
       (description "This program connects the database server through Perl's
 DBI, and provides DB-accessing API and the simple management UI.")