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

gnu: webkitgtk: Use GCC 11 instead of Clang.

Browse source 
WebkitGTK still compiles fine on x86_64 using GCC 11.  This is the only
architecture known to compile currently, as i686 fails with Clang and others
fail due to unsatisfied dependencies.

* gnu/packages/webkit.scm (webkitgtk)[#:phases]: Drop
‘prepare-build-environment’.
[native-inputs]: Drop clang, add gcc.
This commit is contained in:
Liliana Marie Prikler 2021-11-04 06:08:19 +01:00
parent 63c356fe13
commit 63f78f6a6e
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/webkit.scm
View file

@ -295,11 +295,6 @@ (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"))
@ -309,8 +304,8 @@ (define-public webkitgtk
(string-append doc "/share/gtk-doc")) (string-append doc "/share/gtk-doc"))
#t)))))) #t))))))
(native-inputs (native-inputs
`(("clang" ,clang-11) `(("bison" ,bison)
("bison" ,bison) ("gcc" ,gcc-11)
("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)