diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-08 12:51:29 +0100 |
|---|---|---|
| committer | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-08 13:26:09 +0100 |
| commit | 0fae91a5ef6c1d2718ff0f918ac8c71c4ff181e0 (patch) | |
| tree | 678bb47b86c78dad0b8af32e7c8e2c8534b9b49b | |
| parent | 8fb33f1f7834bad67da66ef36942ce3cccf60c45 (diff) | |
gnu: guile-emacs: Remove hardcoded version from EMACSLOADPATH.
After a question by lilyp via IRC.
* gnu/packages/emacs.scm (guile-emacs): Add "upstream-version" to outer let.
[native-search-paths]: Use that for EMACSLOADPATH and add a comment.
Change-Id: Ie2c222a53a5bd79b1a8a0b8424a90e6e06b77fb9
| -rw-r--r-- | gnu/packages/emacs.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e6dd17b510d..c32d28b404b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -629,12 +629,13 @@ editor (with wide ints)" ) (deprecated-package "emacs-next-tree-sitter" emacs-next)) (define-public guile-emacs - (let ((commit "8f87cbc1dae6a9e77368afc5736df8c342e9153d") + (let ((upstream-version "31.0.50") + (commit "8f87cbc1dae6a9e77368afc5736df8c342e9153d") (revision "0")) (package (inherit emacs) (name "guile-emacs") - (version (git-version "0.0.0" revision commit)) + (version (git-version upstream-version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -687,8 +688,10 @@ editor (with wide ints)" ) (lambda (port) (display port))))))))) (native-search-paths (list (search-path-specification + ;;guile-emacs needs this non-standard load-path for now (variable "EMACSLOADPATH") - (files '("share/emacs/31.0.50/lisp"))) + (files + (list (string-append "share/emacs/" upstream-version "/lisp")))) (search-path-specification (variable "INFOPATH") (files '("share/info")))))))) |