gnu: ungoogled-chromium: Use default llvm tooling.

Use default llvm tools, currently at version 22.

* gnu/packages/chromium.scm (lld-as-ld-wrapper-21): Delete variable.
(ungoogled-chromium) [arguments] <#:configure-flags>: Adjust to
default clang.
[native-inputs]: Use default clang, clang-runtime, clang-toolchain,
lld-as-ld-wrapper and llvm.

Signed-off-by: Andreas Enge <andreas@enge.fr>

1 files changed, 7 insertions, 10 deletions

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index a4e2b0efc6a..147ed0ea8b6 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -602,9 +602,6 @@
         `(cons "--enable-custom-modes"
                ,flags))))))
 
-(define lld-as-ld-wrapper-21
-  (make-lld-wrapper lld-21 #:lld-as-ld? #t))
-
 (define-public ungoogled-chromium
   (package
     (name "ungoogled-chromium")
@@ -702,7 +699,7 @@
                              "\"")
 
               (string-append "clang_version="
-                             #$(version-major (package-version clang-21)))
+                             #$(version-major (package-version clang)))
 
               (string-append "rust_sysroot_absolute=\""
                              (dirname (dirname (search-input-file %build-inputs
@@ -895,7 +892,7 @@
                         (string-append " -stdlib=libc++"
                                        " -Wl,--stats"))
                 (setenv "CLANG_MVERS" #$(version-major
-                                         (package-version clang-21)))
+                                         (package-version clang)))
                 (setenv "RUSTC_BOOTSTRAP" "1")
 
                 ;; TODO: pre-compile instead. Avoids a race condition.
@@ -1027,13 +1024,13 @@
                    '("24" "48" "64" "128" "256")))))))))
     (native-inputs
      (list bison
-           clang-21
-           clang-runtime-21
-           clang-toolchain-21
+           clang
+           clang-runtime
+           clang-toolchain
            gn
            gperf
-           lld-as-ld-wrapper-21
-           llvm-21
+           lld-as-ld-wrapper
+           llvm
            ninja
            node-lts
            pkg-config