mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile-emacs: Support running emacs from the store.

Browse source 
* gnu/packages/emacs.scm (guile-emacs)[argumets]: Replace stage
"wrap-emacs-paths" to restrict EMACSLOADPATH.
[native-search-paths]: Remove.

Change-Id: Ie2c222a53a5bd79b1a8a0b8424a90e6e06b77fb9
This commit is contained in:
Janneke Nieuwenhuizen 2024-12-08 15:36:38 +01:00
parent eafd91c262
commit e46bc3d928
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gnu/packages/emacs.scm
View file

@ -678,6 +678,39 @@ (define-public guile-emacs
(delete 'restore-emacs-pdmp)
(delete 'build-trampolines)
(delete 'install-site-start)
(replace 'wrap-emacs-paths
;; Restrict EMACSLOADPATH to builtin packages.
(lambda _
(let ((lisp-dirs (list (string-append
#$output "/share/emacs/"
#$upstream-version "/lisp")))
(inputs '#$(map (match-lambda
((name directory)
#~(#$name . #$directory)))
(package-inputs this-package))))
(for-each
(lambda (prog)
(wrap-program prog
;; Some variants rely on uname being in PATH for Tramp.
;; Tramp paths can't be hardcoded, because they need to
;; be portable.
`("PATH" suffix
,(map dirname
(list (search-input-file inputs "/bin/gzip")
;; for coreutils
(search-input-file inputs "/bin/yes"))))
;; We use "=" because loading non-builtin packages is
;; currently not supported and prevents guile-emacs
;; from running.
`("EMACSLOADPATH" = ,lisp-dirs)))
(find-files
(string-append #$output "/bin")
;; Matches versioned and unversioned emacs binaries.
;; We don't patch emacsclient, because it takes its
;; environment variables from emacs.
;; Likewise, we don't need to patch helper binaries
;; like etags, ctags or ebrowse.
"^emacs(-[0-9]+(\\.[0-9]+)*)?$")))))
(add-after 'unpack 'help-patch-progam-file-names
(lambda _
(call-with-output-file "lisp/obsolete/terminal.el"
@ -685,16 +718,7 @@ (define-public guile-emacs
(add-after 'configure 'touch-lisp/finder-inf.el
(lambda _
(call-with-output-file "lisp/finder-inf.el"
(lambda (port) (display port)))))))))
(native-search-paths
(list (search-path-specification
;;guile-emacs needs this non-standard load-path for now
(variable "EMACSLOADPATH")
(files
(list (string-append "share/emacs/" upstream-version "/lisp"))))
(search-path-specification
(variable "INFOPATH")
(files '("share/info"))))))))
(lambda (port) (display port))))))))))))
(define-public m17n-db
(package