guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

23/44: gnu: libnma: Remove patch-docbook-xml phase.


From: guix-commits
Subject: 23/44: gnu: libnma: Remove patch-docbook-xml phase.
Date: Fri, 21 Apr 2023 00:48:25 -0400 (EDT)

apteryx pushed a commit to branch core-updates
in repository guix.

commit 0d774808542834b399838e1dba5be3186254b838
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Apr 20 15:57:09 2023 -0400

    gnu: libnma: Remove patch-docbook-xml phase.
    
    * gnu/packages/gnome.scm (libnma) [arguments]: Remove patch-docbook-xml
    phase.  Use gexps.
    [native-inputs]: Add libxml2.
---
 gnu/packages/gnome.scm | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2c2de935ed..3eb7cb62a3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1748,23 +1748,16 @@ client devices can handle.")
     (arguments
      ;; GTK 4.x depends on Rust (indirectly) so pull it only on platforms
      ;; where it is supported.
-     `(#:configure-flags ,(if (supported-package? gtk)
-                              `(list "-Dlibnma_gtk4=true")
-                              `(list "-Dlibnma_gtk4=false"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-docbook-xml
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "libnma-docs.xml"
-               (("http://.*/docbookx\\.dtd";)
-                (search-input-file
-                 inputs "xml/dtd/docbook/docbookx.dtd"))))))))
+     (list #:configure-flags (if (supported-package? gtk)
+                                 #~(list "-Dlibnma_gtk4=true")
+                                 #~(list "-Dlibnma_gtk4=false"))))
     (native-inputs
      (list docbook-xml-4.3
            gettext-minimal
            `(,glib "bin")
            gtk-doc/stable
            gobject-introspection
+           libxml2                      ;for XML_CATALOG_FILES
            pkg-config
            vala))
     (inputs



reply via email to

[Prev in Thread] Current Thread [Next in Thread]