diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2024-09-01 20:03:59 -0400 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-11-05 11:56:26 -0500 |
| commit | 6ebb5ecafc6818c589d8960760abd20344c0a699 (patch) | |
| tree | f19ec765946a352fb579ff00229d46db0e02f2e9 | |
| parent | 8a602183ff40c02a88f5791427a93bf72b6463f0 (diff) | |
| download | guix-6ebb5ecafc6818c589d8960760abd20344c0a699.tar.gz guix-6ebb5ecafc6818c589d8960760abd20344c0a699.zip | |
gnu: llvm-for-mesa: Update to llvm-18.
* gnu/packages/llvm.scm (llvm-for-mesa): Update to llvm-18.
* gnu/packages/gl.scm (mesa)[inputs]: Always use llvm-for-mesa (remove llvm-18
for aarch64 to use llvm-for-mesa).
(mesa-opencl)[native-inputs]: Remove clang-15. Add clang-18.
Change-Id: I767d40d62a827864d3d109c44f82a43302875eb8
| -rw-r--r-- | gnu/packages/gl.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/llvm.scm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 21be697d3b..f056cc07fa 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -324,15 +324,15 @@ also known as DXTn or DXTC) for Mesa.") (inputs (append (if (target-aarch64?) - (list clang-18 - llvm-18) - (list llvm-for-mesa)) + (list clang-18) + '()) (list elfutils ;libelf required for r600 when using llvm expat (force libva-without-mesa) libxml2 libxrandr libxvmc + llvm-for-mesa vulkan-loader wayland wayland-protocols @@ -603,7 +603,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") (if (target-aarch64?) (package-native-inputs mesa) (modify-inputs (package-native-inputs mesa) - (prepend clang-15)))))) + (prepend clang-18)))))) (define-public mesa-opencl-icd (package/inherit mesa-opencl diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 9f851a478e..5333e1c3aa 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -2158,7 +2158,7 @@ using @code{clang-rename}."))) (define-public llvm-for-mesa ;; Note: update the 'clang' input of mesa-opencl when bumping this. - (let ((base-llvm llvm-15)) + (let ((base-llvm llvm-18)) (package (inherit base-llvm) (name "llvm-for-mesa") |