gnu: emacs-no-x: Use new package style.

* gnu/packages/emacs.scm (emacs-no-x)[arguments]: Convert to list of
G-Expressions.
[inputs]: Use modify-inputs.
This commit is contained in:
Liliana Marie Prikler 2022-05-15 00:10:59 +02:00
parent a56a3fa761
commit 4949188d46
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87

View file

@ -402,22 +402,20 @@ (define-public emacs-no-x
(synopsis "The extensible, customizable, self-documenting text
editor (console only)")
(build-system gnu-build-system)
(inputs (fold alist-delete
(package-inputs emacs)
'("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg"
"imagemagick" "libpng" "librsvg" "libxpm" "libice"
"libsm" "cairo" "pango" "harfbuzz"
;; These depend on libx11, so remove them as well.
"libotf" "m17n-lib" "dbus")))
(inputs (modify-inputs (package-inputs emacs)
(delete "libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg"
"imagemagick" "libpng" "librsvg" "libxpm" "libice"
"libsm" "cairo" "pango" "harfbuzz"
;; These depend on libx11, so remove them as well.
"libotf" "m17n-lib" "dbus")))
(arguments
(substitute-keyword-arguments (package-arguments emacs)
((#:configure-flags flags ''())
`(delete "--with-cairo" ,flags))
((#:configure-flags flags #~'())
#~(delete "--with-cairo" #$flags))
((#:phases phases)
`(modify-phases ,phases
(delete 'restore-emacs-pdmp)
(delete 'strip-double-wrap)))))))
#~(modify-phases #$phases
(delete 'restore-emacs-pdmp)
(delete 'strip-double-wrap)))))))
(define-public emacs-no-x-toolkit
(package/inherit emacs