From: Alex Kost <alezost@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH] build: emacs: Search elisp files in "share/emacs/site-lisp".
Date: Mon, 20 Jun 2016 16:10:35 +0300 [thread overview]
Message-ID: <87d1ncatv8.fsf@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
Ricardo found a problem while working on some emacs package that
requires EMMS: the elisp file(s) of this package is(are) not compiled.
This happens because currently emacs-build-system adds only
"share/emacs/site-lisp/guix.d/<package>" to emacs load-path when it
compiles elisp files, but some emacs packages (for example, emms) put
their files in "share/emacs/site-lisp", so this directory should also be
added. The attached patch will do it.
(I added a copyright line for David because he forgot to do it in commit 578b96af69057883a2a49a34dd6fe261cb2f4e5c)
[-- Attachment #2: 0001-build-emacs-Search-elisp-files-in-share-emacs-site-l.patch --]
[-- Type: text/x-patch, Size: 1755 bytes --]
From a63b787b545d5b9fcc2a2c76e9e102144fafa0e8 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Mon, 20 Jun 2016 15:49:04 +0300
Subject: [PATCH] build: emacs: Search elisp files in "share/emacs/site-lisp".
* guix/build/emacs-build-system.scm (emacs-inputs-el-directories):
Add ".../share/emacs/site-lisp" directory to the returned result as
elisp files can also be placed there.
---
guix/build/emacs-build-system.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index ab97001..44e8b0d 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -1,5 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
+;;; Copyright © 2016 David Thompson <davet@gnu.org>
+;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -152,10 +154,11 @@ store in '.el' files."
(define (emacs-inputs-el-directories dirs)
"Build the list of Emacs Lisp directories from the Emacs package directory
DIRS."
- (map (lambda (d)
- (string-append d %install-suffix "/"
- (store-directory->elpa-name-version d)))
- dirs))
+ (append-map (lambda (d)
+ (list (string-append d "/share/emacs/site-lisp")
+ (string-append d %install-suffix "/"
+ (store-directory->elpa-name-version d))))
+ dirs))
(define (package-name-version->elpa-name-version name-ver)
"Convert the Guix package NAME-VER to the corresponding ELPA name-version
--
2.8.3
next reply other threads:[~2016-06-20 13:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 13:10 Alex Kost [this message]
2016-06-21 19:29 ` [PATCH] build: emacs: Search elisp files in "share/emacs/site-lisp" Ricardo Wurmus
2016-06-21 20:41 ` Ludovic Courtès
2016-06-22 8:16 ` Alex Kost
2016-06-23 5:30 ` Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d1ncatv8.fsf@gmail.com \
--to=alezost@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.