diff options
author | gemmaro <gemmaro.dev@gmail.com> | 2024-06-22 08:02:55 +0900 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-06-23 10:09:01 +0200 |
commit | d69270b696a9badd0ba91fd1ec94f6f292ac1a53 (patch) | |
tree | 2abf7e9cf1bf4787c6e3d661fb55a3ee9b154446 /gnu/packages | |
parent | 6e6bb643750cb1441f702d2229978c288177a17b (diff) |
gnu: emacs-ddskk: Use newer package style.
* gnu/packages/emacs-xyz.scm (emacs-ddskk)[arguments]:
Convert to list of G-Expressions.
Use #$output rather than the outputs alist.
Drop trailing #t.
(emascs-ddskk-nicola): Likewise.
Change-Id: Ie6ed743ded35b55fa55bb61d02353456a0f2c79f
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/emacs-xyz.scm | 78 |
1 files changed, 38 insertions, 40 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1f440630ca..903c22bbcb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37033,28 +37033,27 @@ a @samp{date} keywords, and optionally, a @samp{filetags} keyword.") (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72")))) (build-system gnu-build-system) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:test-target "test" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (emacs-substitute-variables "SKK-MK" - ("PREFIX" (assoc-ref outputs "out")) - ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX)) - ("SKK_PREFIX" "") - ("SKK_INFODIR" '(expand-file-name "info" PREFIX))) - #t)) - (add-after 'unpack 'fix-test - (lambda _ - (substitute* "Makefile" - (("/bin/rm") (which "rm"))) - (substitute* "nicola/Makefile" - (("/bin/rm") (which "rm")))))))) + (list #:modules '((guix build gnu-build-system) + (guix build utils) + (guix build emacs-utils)) + #:imported-modules `(,@%gnu-build-system-modules + (guix build emacs-utils)) + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (emacs-substitute-variables "SKK-MK" + ("PREFIX" #$output) + ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX)) + ("SKK_PREFIX" "") + ("SKK_INFODIR" '(expand-file-name "info" PREFIX))))) + (add-after 'unpack 'fix-test + (lambda _ + (substitute* "Makefile" + (("/bin/rm") (which "rm"))) + (substitute* "nicola/Makefile" + (("/bin/rm") (which "rm")))))))) (native-inputs (list emacs-minimal ruby)) (home-page "https://github.com/skk-dev/ddskk") @@ -37071,24 +37070,23 @@ conversion program}, a Japanese input method on Emacs.") (propagated-inputs (list emacs-ddskk)) (arguments - `(#:make-flags - (let ((out (assoc-ref %outputs "out"))) - (append - (list (string-append "PREFIX=" out) - (string-append "LISPDIR=" out "/share/emacs/site-lisp")))) - #:tests? #f ; no tests in this subtree - ,@(substitute-keyword-arguments (package-arguments emacs-ddskk) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'fix-test 'chdir - (lambda _ - (chdir "nicola") - #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (emacs-substitute-sexps "NICOLA-DDSKK-CFG" - ("setq NICOLA-DDSKK_PREFIX" "")) - #t))))))) + (append + (list #:make-flags + #~(append + (list (string-append "PREFIX=" #$output) + (string-append "LISPDIR=" #$output "/share/emacs/site-lisp"))) + ;; no tests in this subtree + #:tests? #f) + (substitute-keyword-arguments (package-arguments emacs-ddskk) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'fix-test 'chdir + (lambda _ + (chdir "nicola"))) + (replace 'configure + (lambda _ + (emacs-substitute-sexps "NICOLA-DDSKK-CFG" + ("setq NICOLA-DDSKK_PREFIX" ""))))))))) (synopsis "Nicola layout for Daredevil SKK") (description "Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji |