amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: llvm-for-mesa: Update to llvm-18.

Browse source 
* 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
This commit is contained in:
John Kehayias 2024-09-01 20:03:59 -04:00
parent 8a602183ff
commit 6ebb5ecafc
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/gl.scm
View file

@ -324,15 +324,15 @@ also known as DXTn or DXTC) for Mesa.")
(inputs (inputs
(append (append
(if (target-aarch64?) (if (target-aarch64?)
(list clang-18 (list clang-18)
llvm-18) '())
(list llvm-for-mesa))
(list elfutils ;libelf required for r600 when using llvm (list elfutils ;libelf required for r600 when using llvm
expat expat
(force libva-without-mesa) (force libva-without-mesa)
libxml2 libxml2
libxrandr libxrandr
libxvmc libxvmc
llvm-for-mesa
vulkan-loader vulkan-loader
wayland wayland
wayland-protocols wayland-protocols
@ -603,7 +603,7 @@ from software emulation to complete hardware acceleration for modern GPUs.")
(if (target-aarch64?) (if (target-aarch64?)
(package-native-inputs mesa) (package-native-inputs mesa)
(modify-inputs (package-native-inputs mesa) (modify-inputs (package-native-inputs mesa)
(prepend clang-15)))))) (prepend clang-18))))))
(define-public mesa-opencl-icd (define-public mesa-opencl-icd
(package/inherit mesa-opencl (package/inherit mesa-opencl

2
gnu/packages/llvm.scm
View file

@ -2158,7 +2158,7 @@ using @code{clang-rename}.")))
(define-public llvm-for-mesa (define-public llvm-for-mesa
;; Note: update the 'clang' input of mesa-opencl when bumping this. ;; Note: update the 'clang' input of mesa-opencl when bumping this.
(let ((base-llvm llvm-15)) (let ((base-llvm llvm-18))
(package (package
(inherit base-llvm) (inherit base-llvm)
(name "llvm-for-mesa") (name "llvm-for-mesa")