bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 03:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix: emacs-build-system: Add #:lisp-directory.

Browse source 
* guix/build-system/emacs.scm (emacs-build): Add #:lisp-directory.
* guix/build/emacs-build-system.scm (unpack): Change into lisp-directory
after unpacking.

Change-Id: I3991af7188de72b29b1c6985ffe7185216cedb35
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
Morgan Smith 2025-03-02 14:31:29 -05:00 • committed by Liliana Marie Prikler
parent 83babb5f98
commit 00025ab4ac
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
guix/build-system/emacs.scm
View file

@ -87,6 +87,7 @@
(test-command #f) ; inferred in emacs-build-system
(phases '%standard-phases)
(outputs '("out"))
(lisp-directory #f)
(include (quote %default-include))
(exclude (quote %default-exclude))
(search-paths '())
@ -105,6 +106,7 @@
(use-modules #$@(sexp->gexp modules))
(emacs-build #:name #$name
#:source #+source
#:lisp-directory #$lisp-directory
#:system #$system
#:test-command #$test-command
#:tests? #$tests?

6
guix/build/emacs-build-system.scm
View file

@ -67,7 +67,7 @@ name that has been stripped of the hash and version number."
(strip-store-file-name file) suffix))))
(string-append name suffix))))
(define* (unpack #:key source #:allow-other-keys)
(define* (unpack #:key source lisp-directory #:allow-other-keys)
"Unpack SOURCE into the build directory. SOURCE may be a compressed
archive, a directory, or an Emacs Lisp file."
(if (string-suffix? ".el" source)
@ -76,7 +76,9 @@ archive, a directory, or an Emacs Lisp file."
(chdir "source")
(copy-file source (store-file->elisp-source-file source))
#t)
(gnu:unpack #:source source)))
(begin
(gnu:unpack #:source source)
(and=> lisp-directory chdir))))
(define* (expand-load-path #:key (prepend-source? #t) #:allow-other-keys)
"Expand EMACSLOADPATH, so that inputs, whose code resides in subdirectories,