summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorBrett Gilio <brettg@gnu.org>2020-07-21 12:51:04 -0500
committerBrett Gilio <brettg@gnu.org>2020-07-21 12:51:04 -0500
commitd4b02a6fba7c364ab7c8d257cf9a32134e71ce3e (patch)
tree10ae6422650bd3b49b087fa84b9c3215a115a4e0 /gnu/packages/patches
parent1a1369dc3d0ba3e23f1f23581a0d1aac89e0db48 (diff)
downloadguix-d4b02a6fba7c364ab7c8d257cf9a32134e71ce3e.tar.gz
gnu: emacs-telega: Patch to use telega-server from Guix.
* gnu/packages/patches/emacs-telega-patch-server-functions.patch: New file.
* gnu/local.mk (dist_patch_DATA): Reference new patch.
* gnu/packages/emacs-xyz.scm (emacs-telega)[source]: Use new patch, bump
revision.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/emacs-telega-patch-server-functions.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/gnu/packages/patches/emacs-telega-patch-server-functions.patch b/gnu/packages/patches/emacs-telega-patch-server-functions.patch
new file mode 100644
index 0000000000..e3d49278d0
--- /dev/null
+++ b/gnu/packages/patches/emacs-telega-patch-server-functions.patch
@@ -0,0 +1,31 @@
+Remove interactive build for telega-server, as it fails on Guix.
+Modify the `telega-server--find-bin' function to only use the version
+of telega-server installed by Guix.
+
+Created by Brett Gilio <brettg@gnu.org>
+
+--- a/telega-server.el
++++ b/telega-server.el
+@@ -113,7 +113,6 @@ If already deferring, then just executes the BODY."
+ If BUILD-FLAGS is specified, then rebuild server without any
+ queries using this flags for building, could be empty string.
+ Otherwise query user about building flags."
+-  (interactive)
+   (telega-test-env 'quiet)
+   (when (or build-flags
+             (y-or-n-p "Build `telega-server'? "))
+@@ -137,11 +136,8 @@ Otherwise query user about building flags."
+ (defun telega-server--find-bin ()
+   "Find telega-server executable.
+ Raise error if not found."
+-  (let ((exec-path (cons telega-directory exec-path)))
+-    (or (executable-find "telega-server")
+-        (progn (telega-server-build)
+-               (executable-find "telega-server"))
+-        (error "`telega-server' not found in exec-path"))))
++  (or (executable-find "telega-server")
++      (error "`telega-server' not found in exec-path")))
+ 
+ (defun telega-server-version ()
+   "Return telega-server version."
+