nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: webkitgtk: Remove obsolete phase. 

* gnu/packages/webkit.scm (webkitgtk)[arguments]: Remove #:phases.
(webkitgtk-2.22)[arguments]: Don't reference removed phase.
This commit is contained in:
Marius Bakke 2018-09-20 16:56:15 +02:00
parent 9b1bb75781
commit a0c9ba1d64
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gnu/packages/webkit.scm
View File

@ -87,23 +87,7 @@
;; XXX Disable WOFF2 ‘web fonts’. These were never ;; XXX Disable WOFF2 ‘web fonts’. These were never
;; supported in our previous builds. Enabling them ;; supported in our previous builds. Enabling them
;; requires building libwoff2 and possibly woff2dec. ;; requires building libwoff2 and possibly woff2dec.
"-DUSE_WOFF2=OFF") "-DUSE_WOFF2=OFF")))
#:phases
(modify-phases %standard-phases
(add-after
'set-paths 'add-gst-plugins-base-include-path
(lambda* (#:key inputs #:allow-other-keys)
;; XXX Work around a problem in the build system, which neglects
;; to add -I for gst-plugins-base when compiling
;; Source/WebKit2/UIProcess/WebPageProxy.cpp, apparently assuming
;; that it will be in the same directory as gstreamer's header
;; files.
(setenv "CPATH"
(string-append (getenv "C_INCLUDE_PATH")
":"
(assoc-ref inputs "gst-plugins-base")
"/include/gstreamer-1.0"))
#t)))))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
@ -171,14 +155,12 @@ HTML/CSS applications to full-fledged web browsers.")
`(("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
(substitute-keyword-arguments (package-arguments webkitgtk) `(#:phases (modify-phases %standard-phases
((#:phases phases) (add-before 'configure 'work-around-gcc-7-include-path-issue
`(modify-phases ,phases ;; FIXME: Work around a problem with gcc-7 includes (see
(add-after 'add-gst-plugins-base-include-path ;; <https://bugs.gnu.org/30756>).
'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))))))))