~ruther/guix-local: gnu: webkitgtk: Use GCC 11 instead of Clang.

63f78f6a6ea0d33f3b1fa68c7285cfb865677211 — Liliana Marie Prikler 4 years ago 63c356f

gnu: webkitgtk: Use GCC 11 instead of Clang.

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.

patch browse .tar.gz .zip

1 files changed, 2 insertions(+), 7 deletions(-)

M gnu/packages/webkit.scm

M gnu/packages/webkit.scm => gnu/packages/webkit.scm +2 -7

@@ 295,11 295,6 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.")
                  (("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version)
                   (string-append wpebackend-fdo "/lib/" all)))
                #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
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out"))


@@ 309,8 304,8 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.")
                             (string-append doc "/share/gtk-doc"))
                #t))))))
     (native-inputs
-     `(("clang" ,clang-11)
-       ("bison" ,bison)
+     `(("bison" ,bison)
+       ("gcc" ,gcc-11)
        ("gettext" ,gettext-minimal)
        ("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
        ("gobject-introspection" ,gobject-introspection)