[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: emacs: Fix guix-guile-program default value.
From: |
Mathieu Lirzin |
Subject: |
02/03: emacs: Fix guix-guile-program default value. |
Date: |
Sun, 30 Aug 2015 20:49:15 +0000 |
mthl pushed a commit to branch master
in repository guix.
commit 7061938fdb7524555a8903af59992ae0645c0480
Author: Mathieu Lirzin <address@hidden>
Date: Mon Jul 27 22:55:28 2015 +0200
emacs: Fix guix-guile-program default value.
Fixes <http://bugs.gnu.org/21127>.
* emacs/guix-backend.el: Use guix-config.
(guix-guile-program): Move to ...
* emacs/guix-config.el.in (guix-guile-program): ... here. Use Guile
program file name from compile-time instead of depending on PATH.
---
emacs/guix-backend.el | 10 +---------
emacs/guix-config.el.in | 9 +++++++++
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/emacs/guix-backend.el b/emacs/guix-backend.el
index 73a429b..3fafae4 100644
--- a/emacs/guix-backend.el
+++ b/emacs/guix-backend.el
@@ -52,6 +52,7 @@
;;; Code:
(require 'geiser-mode)
+(require 'guix-config)
(require 'guix-emacs)
(defvar guix-load-path
@@ -63,15 +64,6 @@
(expand-file-name "guix-helper.scm" guix-load-path)
"Auxiliary scheme file for loading.")
-(defvar guix-guile-program (or geiser-guile-binary "guile")
- "Name of the guile executable used for Guix REPL.
-May be either a string (the name of the executable) or a list of
-strings of the form:
-
- (NAME . ARGS)
-
-Where ARGS is a list of arguments to the guile program.")
-
;;; REPL
diff --git a/emacs/guix-config.el.in b/emacs/guix-config.el.in
index 8804f72..16434ce 100644
--- a/emacs/guix-config.el.in
+++ b/emacs/guix-config.el.in
@@ -26,6 +26,15 @@
;; This must match `NIX_STATE_DIR' as defined in `daemon.am'.
(or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix"))
+(defvar guix-guile-program "@GUILE@"
+ "Name of the guile executable used for Guix REPL.
+May be either a string (the name of the executable) or a list of
+strings of the form:
+
+ (NAME . ARGS)
+
+Where ARGS is a list of arguments to the guile program.")
+
(provide 'guix-config)
;;; guix-config.el ends here