ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-16 03:45:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "gnu: webkitgtk: Use GCC 11 instead of Clang."

Browse source 
This reverts commit 63f78f6a6e.
It led to broken builds of epiphany, gnome-online-accounts, yelp,
zenity, surf, and possibly others.
This commit is contained in:
Mark H Weaver 2021-11-04 08:27:15 -04:00
parent 72bf3c0b79
commit 1007eb4874
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/webkit.scm
View file

@ -295,6 +295,11 @@ (define-public webkitgtk
(("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version) (("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version)
(string-append wpebackend-fdo "/lib/" all))) (string-append wpebackend-fdo "/lib/" all)))
#t))) #t)))
(add-before 'configure 'prepare-build-environment
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CC" "clang")
(setenv "CXX" "clang++")
#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)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
@ -304,8 +309,8 @@ (define-public webkitgtk
(string-append doc "/share/gtk-doc")) (string-append doc "/share/gtk-doc"))
#t)))))) #t))))))
(native-inputs (native-inputs
`(("bison" ,bison) `(("clang" ,clang-11)
("gcc" ,gcc-11) ("bison" ,bison)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)