GNU bug report logs - #78315
[PATCH emacs-team 00/53] More fixes, and a lot of style improvements.

Previous Next

Full log

Message #56 received at 78315 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78315 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH 17/53] gnu: emacs-emacsql: Improve style.
Date: Thu,  8 May 2025 14:50:19 +0200

* gnu/packages/emacs-xyz.scm (emacs-emacsql):
  [arguments]<phases>: Improve style of 'fix-executable-paths.
---
 gnu/packages/emacs-xyz.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index cfd0a951fa..6af0109b5d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -25919,12 +25919,12 @@ (define-public emacs-emacsql
       #~(modify-phases %standard-phases
           (add-after 'unpack 'fix-executable-paths
             (lambda* (#:key inputs #:allow-other-keys)
-              (let ((mdb (assoc-ref inputs "mariadb"))
-                    (psql (assoc-ref inputs "postgresql")))
-                (emacs-substitute-variables "emacsql-psql.el"
-                  ("emacsql-psql-executable" (string-append psql "/bin/psql")))
-                (emacs-substitute-variables "emacsql-mysql.el"
-                  ("emacsql-mysql-executable" (string-append mdb "/bin/mysql")))))))))
+              (emacs-substitute-variables "emacsql-psql.el"
+                ("emacsql-psql-executable"
+                 (search-input-file inputs "bin/psql")))
+              (emacs-substitute-variables "emacsql-mysql.el"
+                ("emacsql-mysql-executable"
+                 (search-input-file inputs "/bin/mysql"))))))))
     (inputs (list mariadb postgresql))
     (native-inputs (list emacs-sqlite3-api))
     (home-page "https://github.com/magit/emacsql")
-- 
2.49.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.