From 0dc42f5bbf5e1936d7387de746efbc5edb678693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 5 Dec 2021 23:39:29 +0100 Subject: [PATCH] gnu: librsvg: Simplify inputs. Obtained by running "guix style --input-simplification=always". * gnu/packages/gnome.scm (librsvg, librsvg-2.40): Simplify inputs. --- gnu/packages/gnome.scm | 50 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6e3dbdada8..d349e300fa 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3606,26 +3606,24 @@ for dealing with different structured file formats.") (replace 'install (assoc-ref gnu:%standard-phases 'install))))) (native-inputs - `(("docbook-xml" ,docbook-xml-4.3) - ("glib" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("ruby" ,ruby) - ("vala" ,vala))) + (list docbook-xml-4.3 + `(,glib "bin") + gobject-introspection + pkg-config + python-wrapper + ruby + vala)) (inputs - `(("bzip2" ,bzip2) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("harfbuzz" ,harfbuzz) - ("libcroco" ,libcroco) - ("libgsf" ,libgsf) - ("libxml2" ,libxml2) - ("pango" ,pango))) + (list bzip2 + fontconfig + freetype + harfbuzz + libcroco + libgsf + libxml2 + pango)) (propagated-inputs - `(("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib))) + (list cairo gdk-pixbuf glib)) (synopsis "SVG rendering library") (description "Librsvg is a library to render SVG images to Cairo surfaces. GNOME uses this to render SVG icons. Outside of GNOME, other desktop @@ -3682,20 +3680,14 @@ diagrams.") "bugs/340047.svg" "bugs/749415.svg")))))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. + (list pkg-config + `(,glib "bin") ; glib-mkenums, etc. + gobject-introspection)) ; g-ir-compiler, etc. (inputs - `(("pango" ,pango) - ("libcroco" ,libcroco) - ("bzip2" ,bzip2) - ("libgsf" ,libgsf) - ("libxml2" ,libxml2))) + (list pango libcroco bzip2 libgsf libxml2)) (propagated-inputs ;; librsvg-2.0.pc refers to all of that. - `(("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib))) + (list cairo gdk-pixbuf glib)) (synopsis "Render SVG files using Cairo (ancient C version)") (properties '((hidden? . #t)))))