mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: webkitgtk@2.22: Adjust to documentation output.
This is a follow-up to commit 0ead0b4d2c
.
* gnu/packages/webkit.scm (webkitgtk)[arguments]: Remove hard coded file list.
(webkitgtk-2.22)[arguments]: Inherit phases using SUBSTITUTE-KEYWORD-ARGUMENTS.
This commit is contained in:
parent
aaf0e47f6d
commit
a509b18087
1 changed files with 16 additions and 17 deletions
|
@ -96,14 +96,12 @@ (define-public webkitgtk
|
|||
(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 @@ (define-public webkitgtk-2.22
|
|||
`(("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))))))))
|
||||
|
|
Loading…
Reference in a new issue