guix_mirror_bot pushed a commit to branch emacs-team
in repository guix.
commit ee5539affaf33cd690f6cc2a0505a0c62d627363
Author: Dariqq <[email protected]>
AuthorDate: Thu Jun 18 06:17:39 2026 +0000
gnu: emacs-minimal: Rename doc output to src.
Followup to b30dc52b92e0fa82eabf3255baa1a7601436cb86.
Emacs keeps a reference to the configure-options via EMACS_CONFIG_OPTIONS
used by 'system-configuration-options'.
* gnu/packages/emacs.scm (emacs-minimal)[outputs]: Renamce doc to src.
[#:phases]: Adjust 'install-c-source accordingly.
[properties]: Add description for 'src' output.
Change-Id: Ia0a443dd538093c8c45997532388dab0cdd39784
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/packages/emacs.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 85e91194de..a43d92f2a3 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -236,7 +236,8 @@
(append (find-files "." "\\.elc$")
(find-files "." "loaddefs\\.el$")
(find-files "eshell"
"^esh-groups\\.el$")))))))
- (outputs '("out" "doc"))
+ ;; Don't use doc to avoid keeping a reference via EMACS_CONFIG_OPTIONS
+ (outputs '("out" "src"))
(build-system gnu-build-system)
(arguments
(list
@@ -378,8 +379,8 @@
(("/usr/bin/env") (search-input-file inputs "bin/env"))))))
(add-before 'configure 'install-c-source
(lambda _
- (let ((dest (string-append #$output:doc "/share/emacs/c-source"))
- (lisp-dir (string-append #$output:doc
+ (let ((dest (string-append #$output:src "/share/emacs/c-source"))
+ (lisp-dir (string-append #$output:src
"/share/emacs/site-lisp")))
(mkdir-p dest)
(copy-recursively "src" dest)
@@ -422,7 +423,7 @@
" (advice-add 'package-load-all-descriptors"
" :after #'guix-emacs-load-package-descriptors))\n\n"
";; The file guix-emacs-c-source.el is available from
the"
- " 'doc' output.\n"
+ " 'src' output.\n"
"(require 'guix-emacs-c-source nil t)"))))
;; Remove the extraneous subdirs.el file, as it causes Emacs to
;; add recursively all the the sub-directories of a profile's
@@ -493,7 +494,8 @@ languages.")
(search-path-specification
(variable "TREE_SITTER_GRAMMAR_PATH")
(files '("lib/tree-sitter")))))
- (properties `((upstream-name . "emacs")))))
+ (properties `((upstream-name . "emacs")
+ (output-synopsis "src" "C source files")))))
(define-public emacs-no-x
(package/inherit emacs-minimal
