From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH] build: emacs: Search elisp files in "share/emacs/site-lisp". Date: Mon, 20 Jun 2016 16:10:35 +0300 Message-ID: <87d1ncatv8.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEyyR-0005fU-Fj for guix-devel@gnu.org; Mon, 20 Jun 2016 09:10:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bEyyM-0002xx-Lt for guix-devel@gnu.org; Mon, 20 Jun 2016 09:10:43 -0400 Received: from mail-lf0-x230.google.com ([2a00:1450:4010:c07::230]:33439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEyyM-0002xd-CN for guix-devel@gnu.org; Mon, 20 Jun 2016 09:10:38 -0400 Received: by mail-lf0-x230.google.com with SMTP id f6so37400688lfg.0 for ; Mon, 20 Jun 2016 06:10:38 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --=-=-= Content-Type: text/plain 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/" 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) --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-build-emacs-Search-elisp-files-in-share-emacs-site-l.patch Content-Transfer-Encoding: quoted-printable >From a63b787b545d5b9fcc2a2c76e9e102144fafa0e8 Mon Sep 17 00:00:00 2001 From: Alex Kost 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-sys= tem.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 =C2=A9 2015 Federico Beffa +;;; Copyright =C2=A9 2016 David Thompson +;;; Copyright =C2=A9 2016 Alex Kost ;;; ;;; 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 directo= ry 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)) =20 (define (package-name-version->elpa-name-version name-ver) "Convert the Guix package NAME-VER to the corresponding ELPA name-version --=20 2.8.3 --=-=-=--