[bug#78315,v3,17/53] gnu: emacs-emacsql: Improve style.

Message ID 20250518081658.11362-17-ngraves@ngraves.fr
State New
Headers
Series [bug#78315,v3,01/53] gnu: emacs-emms: Fix build. |

Commit Message

Nicolas Graves May 18, 2025, 8:16 a.m. UTC
  * 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(-)
  

Patch

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0b70e59a7e..58611b000b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -25918,12 +25918,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")