TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: webkitgtk@2.22: Adjust to documentation output.

Browse source 
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:
Marius Bakke 2018-11-11 18:09:55 +01:00
parent aaf0e47f6d
commit a509b18087
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gnu/packages/webkit.scm
View file

@ -96,14 +96,12 @@ (define-public webkitgtk
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-gtk-doc-scan (add-after 'unpack 'patch-gtk-doc-scan
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/docs/webkitdomgtk-docs.sgml" (for-each (lambda (file)
(("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") (substitute* file
(string-append (assoc-ref inputs "docbook-xml") (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd")
"/xml/dtd/docbook/docbookx.dtd"))) (string-append (assoc-ref inputs "docbook-xml")
(substitute* "Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml" "/xml/dtd/docbook/docbookx.dtd"))))
(("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") (find-files "Source" "\\.sgml$"))
(string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/docbookx.dtd")))
#t)) #t))
(add-after 'install 'move-doc-files (add-after 'install 'move-doc-files
(lambda* (#:key outputs #:allow-other-keys) (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 `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer
,@(package-native-inputs webkitgtk))) ,@(package-native-inputs webkitgtk)))
(arguments (arguments
`(#:phases (modify-phases %standard-phases (substitute-keyword-arguments (package-arguments webkitgtk)
(add-before 'configure 'work-around-gcc-7-include-path-issue ((#:phases phases)
;; FIXME: Work around a problem with gcc-7 includes (see `(modify-phases ,phases
;; <https://bugs.gnu.org/30756>). (add-before 'configure 'work-around-gcc-7-include-path-issue
(lambda _ ;; FIXME: Work around a problem with gcc-7 includes (see
(unsetenv "C_INCLUDE_PATH") ;; <https://bugs.gnu.org/30756>).
(unsetenv "CPLUS_INCLUDE_PATH") (lambda _
#t))) (unsetenv "C_INCLUDE_PATH")
,@(package-arguments webkitgtk))))) (unsetenv "CPLUS_INCLUDE_PATH")
#t))))))))