From 4949188d465dd008c73c54d71baa2def676a445a Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 15 May 2022 00:10:59 +0200 Subject: 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. --- gnu/packages/emacs.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6423845013..d46b194441 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -402,22 +402,20 @@ editor (with xwidgets support)") (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 -- cgit v1.2.3