diff options
| author | Cayetano Santos <csantosb@inventati.org> | 2025-07-08 08:47:32 +0200 |
|---|---|---|
| committer | Ian Eure <ian@retrospec.tv> | 2025-07-08 20:51:27 -0700 |
| commit | 8ee456e2bda8f72ccaf2398a1709a85e6e32d952 (patch) | |
| tree | 51bf81a3397907f9aad8c8fe77f5ce11a4a91d48 | |
| parent | 3795345f95b868f1e778f32bb35444f886caa623 (diff) | |
| download | guix-8ee456e2bda8f72ccaf2398a1709a85e6e32d952.tar guix-8ee456e2bda8f72ccaf2398a1709a85e6e32d952.tar.gz | |
gnu: emacs-magit: Improve style.
* gnu/packages/emacs-xyz.scm (emacs-magit): Replace phase by
lisp-directory.
<:#lisp-directory>: Set to "lisp".
<:#phases>{chdir-lisp}: Remove.
{build-info-manual}: Adapt paths.
{patch-version-executables}: Run after unpack phase.
Change-Id: If1efe3ca159764cc6ba59d0b061ac447766b7927
Signed-off-by: Ian Eure <ian@retrospec.tv>
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d6d6bee5cf..ebfe22b389 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2087,19 +2087,17 @@ before interacting with non-free LLMs.") (build-system emacs-build-system) (arguments (list + #:lisp-directory "lisp" #:test-command #~(list "make" "-C" ".." "test") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'build-info-manual (lambda _ - (invoke "make" "info") + (invoke "make" "-C" ".." "info") ;; Copy info files to the lisp directory, which acts as ;; the root of the project for the emacs-build-system. - (rename-file "docs/magit.info" "lisp/magit.info"))) - (add-after 'build-info-manual 'chdir-lisp - (lambda _ - (chdir "lisp"))) - (add-after 'chdir-lisp 'patch-version-executables + (rename-file "../docs/magit.info" "../lisp/magit.info"))) + (add-after 'unpack 'patch-version-executables (lambda* (#:key inputs #:allow-other-keys) (emacs-substitute-variables "magit.el" ("magit-version" #$version)) |