[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: emacs-telega: Fix 'patch-source' phase.
From: |
guix-commits |
Subject: |
01/02: gnu: emacs-telega: Fix 'patch-source' phase. |
Date: |
Fri, 9 Jul 2021 11:58:52 -0400 (EDT) |
leoprikler pushed a commit to branch master
in repository guix.
commit 2086a6a335a23ae56485592f62c77cb088d62fff
Author: Zhu Zihao <all_but_last@163.com>
AuthorDate: Fri Jul 9 22:58:34 2021 +0800
gnu: emacs-telega: Fix 'patch-source' phase.
* gnu/packages/emacs-xyz.scm (emacs-telega)[#:phases]<patch-sources>:
Add missing slash in ‘/bin’ when patching general commands.
Also patch telega-vvnote.el.
Signed-off-by: Leo Prikler <leo.prikler@student.tugraz.at>
---
gnu/packages/emacs-xyz.scm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6ac61fd..16cd0d8 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -26290,17 +26290,17 @@ service, and connect it with Emacs via inter-process
communication.")
(let* ((ffmpeg (assoc-ref inputs "ffmpeg"))
(ffmpeg-bin (string-append ffmpeg "/bin/ffmpeg"))
(ffplay-bin (string-append ffmpeg "/bin/ffplay")))
- (substitute* "telega-ffplay.el"
- (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)"
- all func cmd)
- (string-append func " \"" (assoc-ref inputs "ffmpeg")
- "bin/" cmd))
- (("\\(executable-find \"ffplay\"\\)")
- (string-append "(and (file-executable-p \"" ffplay-bin "\")"
- "\"" ffplay-bin "\")"))
- (("\\(executable-find \"ffmpeg\"\\)")
- (string-append "(and (file-executable-p \"" ffmpeg-bin "\")"
- "\"" ffmpeg-bin "\")"))))))
+ (substitute* '("telega-ffplay.el" "telega-vvnote.el")
+ (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)"
+ all func cmd)
+ (string-append func " \"" (assoc-ref inputs "ffmpeg")
+ "/bin/" cmd))
+ (("\\(executable-find \"ffplay\"\\)")
+ (string-append "(and (file-executable-p \"" ffplay-bin "\")"
+ "\"" ffplay-bin "\")"))
+ (("\\(executable-find \"ffmpeg\"\\)")
+ (string-append "(and (file-executable-p \"" ffmpeg-bin "\")"
+ "\"" ffmpeg-bin "\")"))))))
(add-after 'unpack 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "telega-server.el"