~ruther/guix-local

b3fee145df2a2cb310ced2e7f34e0a2b6083e661 — Alex Kost 10 years ago 004ea62
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.
1 files changed, 4 insertions(+), 2 deletions(-)

M gnu/system.scm
M gnu/system.scm => gnu/system.scm +4 -2
@@ 581,8 581,10 @@ use 'plain-file' instead~%")
    ("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")))