aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiliana Marie Prikler <liliana.prikler@gmail.com>2021-10-13 21:32:07 +0200
committerLiliana Marie Prikler <liliana.prikler@gmail.com>2021-12-03 21:39:49 +0100
commitf725279cdd66e7739fd756807ef2a1c7b1611d51 (patch)
treef21e44c4489ee1ef25afcb0de167805d1842ef04
parent269baba919886961979d91670f9f755daa6ce160 (diff)
downloadguix-f725279cdd66e7739fd756807ef2a1c7b1611d51.tar
guix-f725279cdd66e7739fd756807ef2a1c7b1611d51.tar.gz
gnu: emacs: Find real GVFS processes.
* gnu/packages/emacs.scm (emacs)[#:phases]<patch-program-file-names>: Expand calls to “tramp-compat-process-running-p” so that Guix wrappers are also matched.
-rw-r--r--gnu/packages/emacs.scm6
1 files changed, 6 insertions, 0 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 22d8db3839..0430a79716 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -136,6 +136,12 @@
"lisp/progmodes/sh-script.el")
(("\"/bin/sh\"")
(format #f "~s" (which "sh"))))
+ ;; match ".gvfs-fuse-daemon-real" and ".gvfsd-fuse-real"
+ ;; respectively when looking for GVFS processes.
+ (substitute* "lisp/net/tramp-gvfs.el"
+ (("\\(tramp-compat-process-running-p \"(.*)\"\\)" all process)
+ (format #f "(or ~a (tramp-compat-process-running-p ~s))"
+ all (string-append "." process "-real"))))
#t))
(add-before 'configure 'fix-/bin/pwd
(lambda _