diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-13 16:29:21 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-13 16:29:21 -0500 |
| commit | 6dffced09ecda024e0884e352778c221ad066fd6 (patch) | |
| tree | 1707e8d8df4d9c47317a39ab6abbfc2ca66a6c29 /gnu/packages/emacs.scm | |
| parent | b603554ed044638dd40b6863d5dada59eefe03b8 (diff) | |
| parent | e3196755e60ba7f1ed9d432e73f26a85e0c8893c (diff) | |
Merge branch 'core-updates-frozen' into 'master'.
At last!
Diffstat (limited to 'gnu/packages/emacs.scm')
| -rw-r--r-- | gnu/packages/emacs.scm | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 03f8c25d67..12046f0d39 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -73,6 +73,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix utils) + #:use-module (ice-9 match) #:use-module (srfi srfi-1)) (define-public emacs @@ -287,8 +288,9 @@ ;; must also provide zlib as an input. ("libpng" ,libpng) ("zlib" ,zlib) - - ("librsvg" ,librsvg) + ("librsvg" ,@(if (target-x86-64?) + (list librsvg-bootstrap) + (list librsvg-2.40))) ("libxpm" ,libxpm) ("libxml2" ,libxml2) ("libice" ,libice) @@ -344,8 +346,8 @@ languages.") (base32 "0igjm9kwiswn2dpiy2k9xikbdfc7njs07ry48fqz70anljj8y7y3")))) (native-inputs - `(("autoconf" ,autoconf) - ,@(package-native-inputs emacs)))))) + (modify-inputs (package-native-inputs emacs) + (prepend autoconf)))))) (define-public emacs-next-pgtk (let ((commit "ae18c8ec4f0ef37c8c9cda473770ff47e41291e2") @@ -369,10 +371,9 @@ languages.") ((#:configure-flags flags ''()) `(cons* "--with-pgtk" "--with-xwidgets" ,flags)))) (propagated-inputs - `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("glib-networking" ,glib-networking))) + (list gsettings-desktop-schemas glib-networking)) (inputs - `(("webkitgtk" ,webkitgtk) + `(("webkitgtk" ,webkitgtk-with-libsoup2) ,@(package-inputs emacs-next))) (home-page "https://github.com/masm11/emacs") (synopsis "Emacs text editor with @code{pgtk} and @code{xwidgets} support") @@ -418,7 +419,7 @@ editor (with xwidgets support)") (delete 'restore-emacs-pdmp) (delete 'strip-double-wrap))))) (inputs - `(("webkitgtk" ,webkitgtk) + `(("webkitgtk" ,webkitgtk-with-libsoup2) ("libxcomposite" ,libxcomposite) ,@(package-inputs emacs))))) @@ -563,12 +564,12 @@ This package contains the library database.") "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq")))) (build-system gnu-build-system) (inputs - `(("fribidi" ,fribidi) - ("gd" ,gd) - ("libotf" ,libotf) - ("libxft" ,libxft) - ("libxml2" ,libxml2) - ("m17n-db" ,m17n-db))) + (list fribidi + gd + libotf + libxft + libxml2 + m17n-db)) (arguments `(#:parallel-build? #f)) ;; With `guix lint' the home-page URI returns a small page saying |