summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2016-07-21 20:13:27 +0300
committerAlex Kost <alezost@gmail.com>2016-07-25 17:18:53 +0300
commitc48899eba2f63bf55e5ad92ab2aafbf15e519eb5 (patch)
tree1d9d8ce27456eb85864f782f8528c7854bfa2d7f
parent07f7cc03cead55543f2df6d6e954010e8c6c1357 (diff)
downloadguix-c48899eba2f63bf55e5ad92ab2aafbf15e519eb5.tar.gz
gnu: emacs: Install site-start.el in non-versioned directory.
Reported by Ricardo Wurmus on #guix.

* gnu/packages/emacs.scm (emacs)[arguments]: Put "site-start.el" in
"/share/emacs/site-lisp" instead of "/share/emacs/<version>/site-lisp"
to let inherited package with another version find it.
-rw-r--r--gnu/packages/emacs.scm4
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 3fcf121dad..eed64f4a08 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -125,9 +125,7 @@
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((guix-src (assoc-ref inputs "guix-src"))
                     (out      (assoc-ref outputs "out"))
-                    (lisp-dir (string-append out "/share/emacs/"
-                                             ,(version-major+minor version)
-                                             "/site-lisp"))
+                    (lisp-dir (string-append out "/share/emacs/site-lisp"))
                     (unpack   (assoc-ref %standard-phases 'unpack)))
                (mkdir "guix")
                (with-directory-excursion "guix"