me
/
guix
Archived
1
0
Fork 0

gnu: mesa: Use llvm-for-mesa.

* gnu/packages/gl.scm (mesa)[inputs]: Replace llvm with llvm-for-mesa.
(mesa-opencl)[native-inputs]: Replace clang with clang-15.
master
Efraim Flashner 2023-01-30 20:06:02 +02:00
parent 572d7e6ce5
commit a59936e10a
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 3 additions and 4 deletions

View File

@ -5,7 +5,7 @@
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Nikita <nikita@n0.is> ;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017-2019, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 20182021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 20182021 Tobias Geerinckx-Rice <me@tobias.gr>
@ -298,8 +298,7 @@ also known as DXTn or DXTC) for Mesa.")
libxml2 libxml2
libxrandr libxrandr
libxvmc libxvmc
;; Note: update the 'clang' input of mesa-opencl when bumping this. llvm-for-mesa
llvm
wayland wayland
wayland-protocols)) wayland-protocols))
(native-inputs (native-inputs
@ -513,7 +512,7 @@ from software emulation to complete hardware acceleration for modern GPUs.")
(prepend libclc))) (prepend libclc)))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs mesa) (modify-inputs (package-native-inputs mesa)
(prepend clang))))) (prepend clang-15)))))
(define-public mesa-opencl-icd (define-public mesa-opencl-icd
(package/inherit mesa-opencl (package/inherit mesa-opencl