guix_mirror_bot pushed a commit to branch rust-team
in repository guix.
commit ca82260e7c09bffce632d8c1aae02759f1cfa032
Author: Efraim Flashner <[email protected]>
AuthorDate: Sun Feb 15 12:18:28 2026 +0200
gnu: rust-cbindgen-cli: Build with newer clang.
* gnu/packages/rust-apps.scm (rust-bindgen-cli)[inputs]: Replace clang
with clang-18.
(rust-bindgen-cli-next): Remove variable.
* gnu/packages/gl.scm (mesa-opencl)[native-inputs]: Remove field.
Change-Id: I1ba0afbd46ac4c70807376c4993af431b775d699
---
gnu/packages/gl.scm | 4 +---
gnu/packages/rust-apps.scm | 8 ++------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index b149ffc508..4101edf60b 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -681,9 +681,7 @@ from software emulation to complete hardware acceleration
for modern GPUs.")
(string-trim-both old-path))))
(if (file-exists? new-path)
(call-with-output-file rusticl.icd
- (lambda (port) (format port "~a\n" new-path)))))))))))
- (native-inputs (modify-inputs (package-native-inputs mesa)
- (replace "rust-bindgen-cli" rust-bindgen-cli-next)))))
+ (lambda (port) (format port "~a\n"
new-path)))))))))))))
;;; ICD was part of the Gallium (Clover) OpenCL driver, which was replaced
;;; with Rusticl.
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index e58dfd8330..66fe94cb60 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -2679,7 +2679,8 @@ support, watch support (like @command{top}) and a tree
view.")
(string-append share "/elvish/lib/bindgen")
(lambda _
(invoke bindgen "--generate-shell-completions"
"elvish")))))))))
- (inputs (cons* bash-minimal clang (cargo-inputs 'rust-bindgen-cli)))
+ ;; Ensure the same version for clang here, mesa's clang and llvm-for-mesa.
+ (inputs (cons* bash-minimal clang-18 (cargo-inputs 'rust-bindgen-cli)))
(home-page "https://rust-lang.github.io/rust-bindgen/";)
(synopsis "Generate Rust FFI bindings to C and C++ libraries")
(description "This package can be used to automatically generate Rust FFI
@@ -2687,11 +2688,6 @@ bindings to C and C++ libraries. This package provides
the @command{bindgen}
command.")
(license license:bsd-3)))
-(define-public rust-bindgen-cli-next
- (package/inherit rust-bindgen-cli
- (inputs (modify-inputs (package-inputs rust-bindgen-cli)
- (replace "clang" clang-18)))))
-
(define-public sniffglue
(package
(name "sniffglue")
