From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH] gnu: emacs: Install site-start.el in non-versioned directory. Date: Thu, 21 Jul 2016 20:28:06 +0300 Message-ID: <87k2geyk7t.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQHle-0005bu-UZ for guix-devel@gnu.org; Thu, 21 Jul 2016 13:28:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQHla-00051O-Cr for guix-devel@gnu.org; Thu, 21 Jul 2016 13:28:13 -0400 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:33413) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQHla-00051H-4K for guix-devel@gnu.org; Thu, 21 Jul 2016 13:28:10 -0400 Received: by mail-lf0-x244.google.com with SMTP id f93so6011971lfi.0 for ; Thu, 21 Jul 2016 10:28:10 -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 tested Emacs 25 with this package definition: and noticed that it doesn't find Emacs packages in ~/.guix-profile. This happens because "site-start.el" in the inherited package is placed "/share/emacs/24.5/site-lisp" directory (the version part is wrong). To avod this, we can put "site-start.el" into a non-versioned site-lisp directory. The patch is attached. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-emacs-Install-site-start.el-in-non-versioned-dir.patch >From 5907c4768bdba861e1c30b1cb5f0a73fe33f9600 Mon Sep 17 00:00:00 2001 From: Alex Kost 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//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 3fcf121..eed64f4 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" -- 2.8.3 --=-=-=--