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

1007eb4874b7d3d2e0ecda07157f5794a0591ea2 — Mark H Weaver 4 years ago 72bf3c0

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

This reverts commit 63f78f6a6ea0d33f3b1fa68c7285cfb865677211.
It led to broken builds of epiphany, gnome-online-accounts, yelp,
zenity, surf, and possibly others.

patch browse .tar.gz .zip

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

M gnu/packages/webkit.scm

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

@@ 295,6 295,11 @@ 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"))


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