diff mbox series

[bug#39740,2/2] gnu: uim: Use emacs-substitute-variables instead of substitute*.

Message ID 20200222171144.24750-2-arunisaac@systemreboot.net
State Accepted
Headers show
Series uim: Do not install files in guix.d. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Arun Isaac Feb. 22, 2020, 5:11 p.m. UTC 
* gnu/packages/xorg.scm (uim)[arguments]: In the configure-uim-el phase, use
emacs-substitute-variables instead of substitute*.
---
 gnu/packages/xorg.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Arun Isaac March 13, 2020, 9:08 a.m. UTC | #1 
Pushed to master!
diff mbox series

Patch

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index a7ba6fe9eb..2bf920b20d 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6145,10 +6145,10 @@  X11 servers, Windows, or macOS.")
          ;; Set path of uim-el-agent and uim-el-helper-agent executables
          (add-after 'configure 'configure-uim-el
            (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "emacs/uim-var.el"
-               (("\"(uim-el-agent|uim-el-helper-agent)\"" _ executable)
-                (string-append "\"" (assoc-ref outputs "out")
-                               "/bin/" executable "\"")))
+             (let ((out (assoc-ref outputs "out")))
+               (emacs-substitute-variables "emacs/uim-var.el"
+                 ("uim-el-agent" (string-append out "/bin/uim-el-agent"))
+                 ("uim-el-helper-agent" (string-append out "/bin/uim-el-helper-agent"))))
              #t))
          ;; Fix installation path by renaming share/emacs/uim-el to
          ;; share/emacs/site-lisp