01/02: gnu: emacs: Adjust 'tramp-remote-path' for remote GuixSD machines.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit dc7010911dd3285fe9089352e92c77501595d100
Author: Ludovic Courtès <address@hidden>
Date:   Thu Feb 9 23:10:49 2017 +0100

    gnu: emacs: Adjust 'tramp-remote-path' for remote GuixSD machines.
    
    * gnu/packages/emacs.scm (emacs)[source](snippet): Patch
    'net/tramp-sh.el'.
---
 gnu/packages/emacs.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index dfdf324..b361fcc 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -110,7 +110,18 @@
                                    (find-files "." "loaddefs\\.el$")
                                    ;; This is the only "autoloads" file that
                                    ;; does not have "*loaddefs.el" name.
-                                   '("eshell/esh-groups.el")))))))
+                                   '("eshell/esh-groups.el")))
+
+                 ;; Make sure Tramp looks for binaries in the right places on
+                 ;; remote GuixSD machines, where 'getconf PATH' returns
+                 ;; something bogus.
+                 (substitute* "net/tramp-sh.el"
+                   ;; Patch the line after "(defcustom tramp-remote-path".
+                   (("\\(tramp-default-remote-path")
+                    (format #f "(tramp-default-remote-path ~s ~s ~s ~s "
+                            "~/.guix-profile/bin" "~/.guix-profile/sbin"
+                            "/run/current-system/profile/bin"
+                            "/run/current-system/profile/sbin")))))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:phases