From: Oleg Pykhalov <go.wigust@gmail.com>
To: Alex Kost <alezost@gmail.com>
Cc: 28832@debbugs.gnu.org
Subject: [bug#28832] [PATCH 1/3] gnu: Add emacs-json-reformat.
Date: Fri, 15 Dec 2017 12:36:28 +0300 [thread overview]
Message-ID: <877etofi3n.fsf@gmail.com> (raw)
In-Reply-To: <87fu8famhm.fsf@gmail.com> (Alex Kost's message of "Tue, 12 Dec 2017 20:23:49 +0300")
[-- Attachment #1.1: [PATCH] emacs-build-system: Add EMACSLOADPATH. --]
[-- Type: text/x-patch, Size: 3790 bytes --]
From adda59022a61dfcf2add1d9f01d02df4be90a0f1 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Wed, 13 Dec 2017 08:10:21 +0300
Subject: [PATCH] emacs-build-system: Add EMACSLOADPATH.
* guix/build/emacs-build-system.scm: Add EMACSLOADPATH.
---
guix/build/emacs-build-system.scm | 47 +++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index bd0d2e026..06479bf6b 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -183,6 +184,10 @@ store in '.el' files."
"Check if NAME correspond to the name of an Emacs package."
(string-prefix? "emacs-" name))
+(define (string-drop-emacs value)
+ "Drops `emacs-' from a string."
+ (string-drop value 6))
+
(define (emacs-inputs inputs)
"Retrieve the list of Emacs packages from INPUTS."
(filter (match-lambda
@@ -222,6 +227,47 @@ second hyphen. This corresponds to 'name-version' as used in ELPA packages."
strip-store-file-name)
store-dir))
+(define (store-directory->package-name store-dir)
+ "Extract package name from STORE-DIR."
+ (let-values (((name _) ((compose package-name->name+version
+ strip-store-file-name)
+ store-dir)))
+ name))
+
+(define (store-directory->package-version store-dir)
+ "Extract package version from STORE-DIR."
+ (let-values (((_ version) ((compose package-name->name+version
+ strip-store-file-name)
+ store-dir)))
+ version))
+
+(define* (setup-environment #:key inputs #:allow-other-keys)
+ "Export the variable EMACSLOADPATH, which are based on INPUTS respectively."
+ (let* ((filtered-inputs (emacs-inputs inputs))
+ (emacs-input-dir (cdr (assoc "emacs" filtered-inputs)))
+ (inputs-dirs (cdr filtered-inputs)))
+ ;; EMACSLOADPATH is where Emacs looks for the source code of the build's
+ ;; dependencies.
+ (setenv "EMACSLOADPATH"
+ (string-append emacs-input-dir "/share/emacs/"
+ (store-directory->package-version emacs-input-dir)
+ "/lisp"))
+ (for-each
+ (lambda (input)
+ (let ((store-item (cdr input)))
+ (setenv "EMACSLOADPATH"
+ (string-append
+ (or (getenv "EMACSLOADPATH") "")
+ ":" store-item %install-suffix "/"
+ ((compose string-drop-emacs store-directory->package-name)
+ store-item)))))
+ ((compose (lambda (inputs) (alist-delete "emacs" inputs))
+ (lambda (inputs) (alist-delete "source" inputs)))
+ (delete-duplicates inputs-dirs)))
+ (format #t "environment variable EMACSLOADPATH set to `~a'~%"
+ (getenv "EMACSLOADPATH"))
+ #t))
+
(define %standard-phases
(modify-phases gnu:%standard-phases
(replace 'unpack unpack)
@@ -229,6 +275,7 @@ second hyphen. This corresponds to 'name-version' as used in ELPA packages."
(delete 'check)
(delete 'install)
(replace 'build build)
+ (add-before 'build 'setup-environment setup-environment)
(add-before 'build 'install install)
(add-after 'install 'make-autoloads make-autoloads)
(add-after 'make-autoloads 'patch-el-files patch-el-files)
--
2.15.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2017-12-15 9:37 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-14 9:51 [bug#28832] [PATCH 0/3] gnu: Add emacs-json-mode Oleg Pykhalov
2017-10-14 10:29 ` [bug#28832] [PATCH 1/3] gnu: Add emacs-json-reformat Oleg Pykhalov
2017-10-14 10:29 ` [bug#28832] [PATCH 2/3] gnu: Add emacs-json-snatcher Oleg Pykhalov
2017-10-20 12:41 ` Ludovic Courtès
2017-10-14 10:29 ` [bug#28832] [PATCH 3/3] gnu: Add emacs-json-mode Oleg Pykhalov
2017-10-20 12:34 ` [bug#28832] [PATCH 1/3] gnu: Add emacs-json-reformat Ludovic Courtès
2017-12-01 10:23 ` Ludovic Courtès
2017-12-11 23:12 ` Oleg Pykhalov
2017-12-12 9:17 ` Ludovic Courtès
2017-12-12 17:23 ` Alex Kost
2017-12-13 4:55 ` Oleg Pykhalov
2017-12-15 20:35 ` Alex Kost
2017-12-15 9:36 ` Oleg Pykhalov [this message]
2017-12-15 14:02 ` Ludovic Courtès
2017-12-19 10:46 ` Oleg Pykhalov
2017-12-19 20:57 ` Alex Kost
2017-12-20 3:26 ` Oleg Pykhalov
2017-12-20 22:10 ` Alex Kost
2017-12-21 4:48 ` Oleg Pykhalov
2017-12-22 20:20 ` Alex Kost
2017-12-15 20:35 ` Alex Kost
2017-12-19 11:07 ` Oleg Pykhalov
2018-01-11 21:46 ` Ludovic Courtès
2018-01-15 12:01 ` bug#28832: " Oleg Pykhalov
2018-01-15 13:33 ` [bug#28832] " Ludovic Courtès
2018-01-16 17:32 ` Alex Kost
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=877etofi3n.fsf@gmail.com \
--to=go.wigust@gmail.com \
--cc=28832@debbugs.gnu.org \
--cc=alezost@gmail.com \
/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.