[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#27845] [PATCH] gnu: emacs: Check GUIX_ENVIRONMENT when autoloading
From: |
Kyle Meyer |
Subject: |
[bug#27845] [PATCH] gnu: emacs: Check GUIX_ENVIRONMENT when autoloading packages |
Date: |
Thu, 27 Jul 2017 01:01:26 -0400 |
Check the environment profile so that we autoload packages that are given as
arguments to "guix environment" but are not in the system or user profile.
Note that the union of Emacs packages in the system, user, and environment
profiles will be autoloaded even when --pure was passed to "guix environment",
because it's not clear how to detect that --pure was given.
* gnu/packages/aux-files/emacs/guix-emacs.el (guix-emacs-autoload-packages):
Add Emacs packages from GUIX_ENVIRONMENT profile.
---
Follow-up to https://lists.gnu.org/archive/html/guix-devel/2017-07/msg00378.html
gnu/packages/aux-files/emacs/guix-emacs.el | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el
b/gnu/packages/aux-files/emacs/guix-emacs.el
index 2bbd639ff..10bad0272 100644
--- a/gnu/packages/aux-files/emacs/guix-emacs.el
+++ b/gnu/packages/aux-files/emacs/guix-emacs.el
@@ -87,9 +87,11 @@ (defun guix-emacs-autoload-packages (&rest profiles)
(interactive (list (if (fboundp 'guix-read-package-profile)
(funcall 'guix-read-package-profile)
guix-user-profile)))
- (let ((profiles (or profiles
- (list "/run/current-system/profile"
- guix-user-profile))))
+ (let* ((env (getenv "GUIX_ENVIRONMENT"))
+ (profiles (or profiles
+ (append (list "/run/current-system/profile"
+ guix-user-profile)
+ (and env (list env))))))
(dolist (profile profiles)
(let ((dirs (guix-emacs-directories profile)))
(when dirs
--
2.13.3
- [bug#27845] [PATCH] gnu: emacs: Check GUIX_ENVIRONMENT when autoloading packages,
Kyle Meyer <=