From c89940a43afe1182266ccd17422e52d1e41e21d4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Nov 2021 16:05:17 +0200 Subject: [PATCH] gnu: Use librsvg-bootstrap. * gnu/packages/emacs.scm (emacs)[inputs]: Use librsvg-bootstrap. * gnu/pacakges/gtk.scm (gtk+-2, gtk+)[propagated-inputs]: Same. --- gnu/packages/emacs.scm | 4 +++- gnu/packages/gtk.scm | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 244a2e665c..4b243e98b6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -288,7 +288,9 @@ ;; must also provide zlib as an input. ("libpng" ,libpng) ("zlib" ,zlib) - ("librsvg" ,(librsvg-for-system)) + ("librsvg" ,@(if (target-x86-64?) + (list librsvg-bootstrap) + (list librsvg-2.40))) ("libxpm" ,libxpm) ("libxml2" ,libxml2) ("libice" ,libice) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5d5e586a6e..cb658af389 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -862,7 +862,10 @@ is part of the GNOME accessibility project.") (outputs '("out" "bin" "doc" "debug")) (propagated-inputs (list atk cairo - (librsvg-for-system) glib pango)) + (if (target-x86-64?) + librsvg-bootstrap + librsvg-2.40) + glib pango)) (inputs (list cups libx11 @@ -958,7 +961,9 @@ application suites.") fribidi fontconfig freetype - (librsvg-for-system) + (if (target-x86-64?) + librsvg-bootstrap + librsvg-2.40) glib libcloudproviders-minimal libepoxy