nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 03:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
509a8c298f
nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch

12 lines
479 B
Diff
Raw Normal View History

emacs: tramp: detect wrapped gvfsd-fuse daemon Tramp checks for a running `gvfsd-fuse` process to figure out whether to enable gvfs-based. Its `tramp-compat-process-running-p` function uses `/proc/<pid>/comm` to check for the name of running process(es). In Nix, the gvfsd processes are launched via wrappers and the name of `gvfsd-fuse` in `comm` in Linux is `.gvfsd-fuse-wra` (truncated to 15 characters) which means the process is not detected and `tramp-gvfs-enabled` ends up with `nil` even when gvfs is available. This patch adds `.gvfsd-fuse-wrapped` to the list of process names to check when determining the value of `tramp-gvfs-enabled`.
2019-01-10 16:06:54 +00:00
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
emacs: 27.1 -> 27.2
2021-04-04 16:17:21 +00:00
index 9e26c8fd6d..fa220e513c 100644
emacs: tramp: detect wrapped gvfsd-fuse daemon Tramp checks for a running `gvfsd-fuse` process to figure out whether to enable gvfs-based. Its `tramp-compat-process-running-p` function uses `/proc/<pid>/comm` to check for the name of running process(es). In Nix, the gvfsd processes are launched via wrappers and the name of `gvfsd-fuse` in `comm` in Linux is `.gvfsd-fuse-wra` (truncated to 15 characters) which means the process is not detected and `tramp-gvfs-enabled` ends up with `nil` even when gvfs is available. This patch adds `.gvfsd-fuse-wrapped` to the list of process names to check when determining the value of `tramp-gvfs-enabled`.
2019-01-10 16:06:54 +00:00
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
emacs: 27.1 -> 27.2
2021-04-04 16:17:21 +00:00
@@ -125,5 +125,6 @@
;; for some processes. Better we don't check.
(<= emacs-major-version 25)
(tramp-compat-process-running-p "gvfs-fuse-daemon")
emacs: 26.3 -> 27.1
2020-08-11 11:41:31 +00:00
+ (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
emacs: tramp: detect wrapped gvfsd-fuse daemon Tramp checks for a running `gvfsd-fuse` process to figure out whether to enable gvfs-based. Its `tramp-compat-process-running-p` function uses `/proc/<pid>/comm` to check for the name of running process(es). In Nix, the gvfsd processes are launched via wrappers and the name of `gvfsd-fuse` in `comm` in Linux is `.gvfsd-fuse-wra` (truncated to 15 characters) which means the process is not detected and `tramp-gvfs-enabled` ends up with `nil` even when gvfs is available. This patch adds `.gvfsd-fuse-wrapped` to the list of process names to check when determining the value of `tramp-gvfs-enabled`.
2019-01-10 16:06:54 +00:00
(tramp-compat-process-running-p "gvfsd-fuse"))))
"Non-nil when GVFS is available.")
Reference in New Issue Copy Permalink