diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gl.scm | 4 | ||||
| -rw-r--r-- | 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 b149ffc5081..4101edf60bb 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 c43487ef43c..65a1c7fdd02 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -2763,7 +2763,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 @@ -2771,11 +2772,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") |