guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 6d50e541cc282ad4efd0e5369aa070f465e24d19
Author: Morgan Smith <[email protected]>
AuthorDate: Sun Dec 7 19:06:57 2025 -0500
gnu: emacs-minimal: Move some snippets to build phases.
The snippets are inherited by emacs-next and friends so this shouldn't
change
any of guix packages but this will allow user source transformations to also
benifit from these snippets.
* gnu/packages/emacs.scm (emacs-minimal): Move some snippets to build
phases.
Change-Id: Ia9af1ee90335189092a6eb36d7b1d8592167782d
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/packages/emacs.scm | 52 +++++++++++++++++++++++++-------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 68968017f8..ebbb58018d 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -169,32 +169,7 @@
(for-each delete-file
(append (find-files "." "\\.elc$")
(find-files "." "loaddefs\\.el$")
- (find-files "eshell" "^esh-groups\\.el$")))
-
- ;; Make sure Tramp looks for binaries in the right places on
- ;; remote Guix System machines, where 'getconf PATH' returns
- ;; something bogus.
- (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 ~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.
- (substitute* "man.el"
- (("\"/usr/local/include\"" line)
- (string-join
- (list line
- "\"~/.guix-profile/include\""
- "\"~/.guix-home/include\""
- "\"/run/current-system/profile/include\"")
- " ")))))))
+ (find-files "eshell"
"^esh-groups\\.el$")))))))
(outputs '("out" "doc"))
(build-system gnu-build-system)
(arguments
@@ -296,6 +271,31 @@
(if replacement
(string-append "\"" replacement "\"")
all))))
+ ;; Make sure Tramp looks for binaries in the right places on
+ ;; remote Guix System machines, where 'getconf PATH' returns
+ ;; something bogus.
+ (substitute* "lisp/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 ~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.
+ (substitute* "lisp/man.el"
+ (("\"/usr/local/include\"" line)
+ (string-join
+ (list line
+ "\"~/.guix-profile/include\""
+ "\"~/.guix-home/include\""
+ "\"/run/current-system/profile/include\"")
+ " ")))
+
;; match ".gvfs-fuse-daemon-real" and ".gvfsd-fuse-real"
;; respectively when looking for GVFS processes.
(substitute* "lisp/net/tramp-gvfs.el"
