01/01: gnu: address@hidden: Adjust to documentation output.

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit a509b180870cf7bffe65a1cd6099487469fae39f
Author: Marius Bakke <address@hidden>
Date:   Sun Nov 11 18:09:55 2018 +0100

    gnu: address@hidden: Adjust to documentation output.
    
    This is a follow-up to commit 0ead0b4d2c025ad1b4a293fb6cbb8a578b7dd87d.
    
    * gnu/packages/webkit.scm (webkitgtk)[arguments]: Remove hard coded file 
list.
    (webkitgtk-2.22)[arguments]: Inherit phases using 
SUBSTITUTE-KEYWORD-ARGUMENTS.
---
 gnu/packages/webkit.scm | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index dfff53c..82f03c7 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -96,14 +96,12 @@
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-gtk-doc-scan
            (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* 
"Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/docs/webkitdomgtk-docs.sgml"
-               (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";)
-                (string-append (assoc-ref inputs "docbook-xml")
-                               "/xml/dtd/docbook/docbookx.dtd")))
-             (substitute* 
"Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
-               (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";)
-                (string-append (assoc-ref inputs "docbook-xml")
-                               "/xml/dtd/docbook/docbookx.dtd")))
+             (for-each (lambda (file)
+                         (substitute* file
+                           
(("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";)
+                            (string-append (assoc-ref inputs "docbook-xml")
+                                           "/xml/dtd/docbook/docbookx.dtd"))))
+                       (find-files "Source" "\\.sgml$"))
              #t))
          (add-after 'install 'move-doc-files
            (lambda* (#:key outputs #:allow-other-keys)
@@ -182,12 +180,13 @@ HTML/CSS applications to full-fledged web browsers.")
      `(("gcc" ,gcc-7)  ; webkitgtk-2.22 requires gcc-6 or newer
        ,@(package-native-inputs webkitgtk)))
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-before 'configure 'work-around-gcc-7-include-path-issue
-                    ;; FIXME: Work around a problem with gcc-7 includes (see
-                    ;; <https://bugs.gnu.org/30756>).
-                    (lambda _
-                      (unsetenv "C_INCLUDE_PATH")
-                      (unsetenv "CPLUS_INCLUDE_PATH")
-                      #t)))
-       ,@(package-arguments webkitgtk)))))
+     (substitute-keyword-arguments (package-arguments webkitgtk)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-before 'configure 'work-around-gcc-7-include-path-issue
+             ;; FIXME: Work around a problem with gcc-7 includes (see
+             ;; <https://bugs.gnu.org/30756>).
+             (lambda _
+               (unsetenv "C_INCLUDE_PATH")
+               (unsetenv "CPLUS_INCLUDE_PATH")
+               #t))))))))