From b3fee145df2a2cb310ced2e7f34e0a2b6083e661 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Fri, 5 Feb 2016 14:07:25 +0300
Subject: [PATCH] system: Fix EMACSLOADPATH.
After commit 13fe4891fa247d306e203ee14c6886513bd86b52, Emacs package
includes "site-start.el", and it has a priority over
"/etc/emacs/site-start.el" on GuixSD because "/etc/emacs" is added to
the end of 'load-path'.
* gnu/system.scm (operating-system-environment-variables): Change
EMACSLOADPATH to prepend "/etc/emacs" to 'load-path' instead of
appending.
---
gnu/system.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index d4759a08ad5..ff3a4007192 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -581,8 +581,10 @@ (define (operating-system-environment-variables os)
("SSL_CERT_DIR" . "/etc/ssl/certs")
("SSL_CERT_FILE" . "/etc/ssl/certs/ca-certificates.crt")
("GIT_SSL_CAINFO" . "/etc/ssl/certs/ca-certificates.crt")
- ;; Append the directory of 'site-start.el' to the search path.
- ("EMACSLOADPATH" . ":/etc/emacs")
+ ;; Prepend the directory of 'site-start.el' to the search path, so
+ ;; that it has higher precedence than the 'site-start.el' file our
+ ;; Emacs package provides.
+ ("EMACSLOADPATH" . "/etc/emacs:")
;; By default, applications that use D-Bus, such as Emacs, abort at startup
;; when /etc/machine-id is missing. Make sure these warnings are non-fatal.
("DBUS_FATAL_WARNINGS" . "0")))
--
GitLab