summaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
authorMathieu Lirzin <mthl@openmailbox.org>2015-07-27 22:55:28 +0200
committerMathieu Lirzin <mthl@openmailbox.org>2015-08-30 22:45:47 +0200
commit7061938fdb7524555a8903af59992ae0645c0480 (patch)
tree633fde53ac87733faa07eee9ecf12a06efa9c943 /emacs
parentbd6163d13f6445b9a1ec0f85e4a19b9f73ab74ea (diff)
downloadpatches-7061938fdb7524555a8903af59992ae0645c0480.tar
patches-7061938fdb7524555a8903af59992ae0645c0480.tar.gz
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.
Diffstat (limited to 'emacs')
-rw-r--r--emacs/guix-backend.el10
-rw-r--r--emacs/guix-config.el.in9
2 files changed, 10 insertions, 9 deletions
diff --git a/emacs/guix-backend.el b/emacs/guix-backend.el
index 73a429b9ee..3fafae4c24 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 8804f72357..16434cecea 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