~ruther/guix-local

c383c3b05914507bffd1fb6fc4506dad91265f0a — John Kehayias 7 months ago 19e9902
gnu: librsvg-2.40: Fix build.

* gnu/packages/gnome.scm (librsvg-2.40)[inputs]: Replace libxml2 with libxml2-2.11.
* gnu/packages/xml.scm (libxml2-2.11): New variable.
(libxml2): Remove outdated comment.

Change-Id: I7080f39aab81ca104836b64dd1f7c10d14157e81
2 files changed, 19 insertions(+), 2 deletions(-)

M gnu/packages/gnome.scm
M gnu/packages/xml.scm
M gnu/packages/gnome.scm => gnu/packages/gnome.scm +1 -1
@@ 3802,7 3802,7 @@ diagrams.")
           `(,glib "bin") ; glib-mkenums, etc.
           gobject-introspection)) ; g-ir-compiler, etc.
    (inputs
     (list pango libcroco libxml2))
     (list pango libcroco libxml2-2.11))
    (propagated-inputs
     ;; librsvg-2.0.pc refers to all of that.
     (list cairo gdk-pixbuf glib))

M gnu/packages/xml.scm => gnu/packages/xml.scm +18 -1
@@ 189,7 189,6 @@ binary extension of XML for the purpose of storing and manipulating data in a
hierarchical form with variable field lengths.")
    (license license:lgpl2.1)))

;; Note: Remember to check python-libxml2 when updating this package.
(define-public libxml2
  (package
    (name "libxml2")


@@ 263,6 262,24 @@ hierarchical form with variable field lengths.")
project (but it is usable outside of the Gnome platform).")
    (license license:x11)))

;; This is an old version (the most recent that works) of libxml2 solely for
;; building librsvg-2.40.
;; XXX: Remove once Rust (and thus newer librsvg) is supported on all
;; platforms.
(define-public libxml2-2.11
  (hidden-package
   (package
     (inherit libxml2)
     (version "2.11.9")
     (source (origin
               (inherit (package-source libxml2))
               (uri (string-append "mirror://gnome/sources/libxml2/"
                                   (version-major+minor version)"/libxml2-"
                                   version ".tar.xz"))
               (sha256
                (base32
                 "17w0a622466k2hi5nln276la6rzfr9xaip3lqj71hmyvxyhmf0bq")))))))

(define-public libxml2-xpath0
  (package/inherit libxml2
    (name "libxml2-xpath0")