amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile-emacs: Remove hardcoded version from EMACSLOADPATH.

Browse source 
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
This commit is contained in:
Janneke Nieuwenhuizen 2024-12-08 12:51:29 +01:00
parent 8fb33f1f78
commit 0fae91a5ef
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/emacs.scm
View file

@ -629,12 +629,13 @@ editor (with wide ints)" )
(deprecated-package "emacs-next-tree-sitter" emacs-next)) (deprecated-package "emacs-next-tree-sitter" emacs-next))
(define-public guile-emacs (define-public guile-emacs
(let ((commit "8f87cbc1dae6a9e77368afc5736df8c342e9153d") (let ((upstream-version "31.0.50")
(commit "8f87cbc1dae6a9e77368afc5736df8c342e9153d")
(revision "0")) (revision "0"))
(package (package
(inherit emacs) (inherit emacs)
(name "guile-emacs") (name "guile-emacs")
(version (git-version "0.0.0" revision commit)) (version (git-version upstream-version revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -687,8 +688,10 @@ editor (with wide ints)" )
(lambda (port) (display port))))))))) (lambda (port) (display port)))))))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
;;guile-emacs needs this non-standard load-path for now
(variable "EMACSLOADPATH") (variable "EMACSLOADPATH")
(files '("share/emacs/31.0.50/lisp"))) (files
(list (string-append "share/emacs/" upstream-version "/lisp"))))
(search-path-specification (search-path-specification
(variable "INFOPATH") (variable "INFOPATH")
(files '("share/info")))))))) (files '("share/info"))))))))