GNU bug report logs - #77034
[PATCH 0/2] gnu: emacs-minimal: Adjust Guix paths in snippet.

Previous Next

Package: guix-patches;

Reported by: Hilton Chain <hako <at> ultrarare.space>

Date: Sat, 15 Mar 2025 13:06:01 UTC

Severity: normal

Tags: patch

Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Full log


View this message in rfc822 format

From: Hilton Chain <hako <at> ultrarare.space>
To: 77034 <at> debbugs.gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>, Andrew Tropin <andrew <at> trop.in>, Cayetano Santos <csantosb <at> inventati.org>, Divya Ranjan Pattanaik <divya <at> subvertising.org>, Ian Eure <ian <at> retrospec.tv>, Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>, Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: [bug#77034] [PATCH 2/2] gnu: emacs-minimal: Adjust Guix paths in snippet.
Date: Sat, 15 Mar 2025 21:07:13 +0800
* gnu/packages/emacs.scm (emacs-minimal)[source]: Add "/run/privileged/bin"
and Guix Home paths to ‘tramp-remote-path’.
Add Guix Home path to ‘Man-header-file-path’.

Change-Id: I20536ae93c74e06eafa5fd26a1b421680c177102
---
 gnu/packages/emacs.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 32733f7b35..eb863110c0 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -135,10 +135,13 @@ (define-public emacs-minimal
                   (substitute* "net/tramp.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")))
+                     (format
+                      #f "(tramp-default-remote-path ~s ~s ~s ~s ~s ~s ~s "
+                      "/run/privileged/bin"
+                      "~/.guix-profile/bin" "~/.guix-profile/sbin"
+                      "~/.guix-home/bin" "~/.guix-home/sbin"
+                      "/run/current-system/profile/bin"
+                      "/run/current-system/profile/sbin")))
 
                   ;; Make sure Man looks for C header files in the right
                   ;; places.
@@ -147,7 +150,8 @@ (define-public emacs-minimal
                      (string-join
                       (list line
                             "\"~/.guix-profile/include\""
-                            "\"/var/guix/profiles/system/profile/include\"")
+                            "\"~/.guix-home/include\""
+                            "\"/run/current-system/profile/include\"")
                       " ")))))))
     (build-system gnu-build-system)
     (arguments
-- 
2.48.1





This bug report was last modified 15 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.