From 8ee456e2bda8f72ccaf2398a1709a85e6e32d952 Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Tue, 8 Jul 2025 08:47:32 +0200 Subject: [PATCH] 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 --- gnu/packages/emacs-xyz.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d6d6bee5cfd24f0a3f8dd65e4c0b6e8a16e66ea0..ebfe22b389e2a60bc4222bc083f54db5ec498dde 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))