From c48899eba2f63bf55e5ad92ab2aafbf15e519eb5 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Thu, 21 Jul 2016 20:13:27 +0300
Subject: [PATCH] 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.
---
 gnu/packages/emacs.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 3fcf121dad6..eed64f4a08b 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -125,9 +125,7 @@ (define-public emacs
            (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"
-- 
GitLab