diff options
Diffstat (limited to 'gnu/packages/emacs.scm')
-rw-r--r-- | gnu/packages/emacs.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 03f8c25d67..4b243e98b6 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) @@ -372,7 +374,7 @@ languages.") `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("glib-networking" ,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 +420,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))))) |