From a59936e10a3cedcd4455bff08f6d709d08d6217b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Jan 2023 20:06:02 +0200 Subject: 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. --- gnu/packages/gl.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3c99c3815d..5151ecdce4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver ;;; Copyright © 2016 Nikita ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus -;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner +;;; Copyright © 2017-2019, 2021, 2023 Efraim Flashner ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice @@ -298,8 +298,7 @@ also known as DXTn or DXTC) for Mesa.") libxml2 libxrandr libxvmc - ;; Note: update the 'clang' input of mesa-opencl when bumping this. - llvm + llvm-for-mesa wayland wayland-protocols)) (native-inputs @@ -513,7 +512,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") (prepend libclc))) (native-inputs (modify-inputs (package-native-inputs mesa) - (prepend clang))))) + (prepend clang-15))))) (define-public mesa-opencl-icd (package/inherit mesa-opencl -- cgit v1.2.3