summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2019-12-09 12:45:00 +0900
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2019-12-09 13:52:22 +0900
commita7a492899adac5047e4b11c77edd881ac1276c37 (patch)
treebe2867df5799ce1dac79fccbc6d882168162518d
parent9beec2173f9243456b6aca470acd926d0dcf9b45 (diff)
downloadguix-a7a492899adac5047e4b11c77edd881ac1276c37.tar.gz
gnu: emacs: Delete the subdirs.el file under the site-lisp directory.
This fixes bug #38533 (see: https://bugs.gnu.org/38533).

* gnu/packages/emacs.scm (emacs)[phases]{install-site-start}: Delete the
subdirs.el file.

Reported-by:  Diego Nicola Barbato <dnbarbato@posteo.de>
-rw-r--r--gnu/packages/emacs.scm5
1 files changed, 5 insertions, 0 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ca5a7b940b..eba7f88551 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -143,6 +143,11 @@
                    (display
                     (string-append "(when (require 'guix-emacs nil t)\n"
                                    "  (guix-emacs-autoload-packages))\n"))))
+               ;; Remove the extraneous subdirs.el file, as it causes Emacs to
+               ;; add recursively all the the sub-directories of a profile's
+               ;; share/emacs/site-lisp union when added to EMACSLOADPATH,
+               ;; which leads to conflicts.
+               (delete-file (string-append lisp-dir "/subdirs.el"))
                #t))))))
     (inputs
      `(("gnutls" ,gnutls)