me
/
guix
Archived
1
0
Fork 0
Code

gnu: mesa: Remove input labels. 

* gnu/packages/gl.scm (mesa)[inputs, native-inputs]: Remove labels.
(mesa-opencl)[inputs-, native-inputs]: Likewise, and use 'modify-inputs'.
master
Ludovic Courtès 2022-05-15 15:52:24 +02:00
parent d0951c288b
commit 0310517e6c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
gnu/packages/gl.scm
View File

@ -287,36 +287,34 @@ also known as DXTn or DXTC) for Mesa.")
libxxf86vm libxxf86vm
xorgproto)) xorgproto))
(inputs (inputs
`(("expat" ,expat) (append (list expat
("libelf" ,elfutils) ;required for r600 when using llvm elfutils ;libelf required for r600 when using llvm
("libva" ,(force libva-without-mesa)) (force libva-without-mesa)
("libxml2" ,libxml2) libxml2
("libxrandr" ,libxrandr) libxrandr
("libxvmc" ,libxvmc) libxvmc
,@(match (%current-system) wayland
((or "x86_64-linux" "i686-linux" "powerpc64le-linux" "aarch64-linux" wayland-protocols)
"powerpc-linux" "riscv64-linux") (if (member (%current-system)
'("x86_64-linux" "i686-linux" "powerpc64le-linux"
"aarch64-linux" "powerpc-linux" "riscv64-linux"))
;; Note: update the 'clang' input of mesa-opencl when bumping this. ;; Note: update the 'clang' input of mesa-opencl when bumping this.
`(("llvm" ,llvm-11))) (list llvm-11)
(_ '())))
`()))
("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)))
(native-inputs (native-inputs
`(("bison" ,bison) (append (list bison
("flex" ,flex) flex
("gettext" ,gettext-minimal) gettext-minimal
,@(match (%current-system) pkg-config
((or "x86_64-linux" "i686-linux" "powerpc64le-linux" "aarch64-linux" python-wrapper
"powerpc-linux" "riscv64-linux") python-libxml2 ;for OpenGL ES 1.1 and 2.0 support
`(("glslang" ,glslang))) python-mako
(_ (@ (gnu packages base) which))
`())) (if (member (%current-system)
("pkg-config" ,pkg-config) '("x86_64-linux" "i686-linux" "powerpc64le-linux"
("python" ,python-wrapper) "aarch64-linux" "powerpc-linux" "riscv64-linux"))
("python-libxml2", python-libxml2) ;for OpenGL ES 1.1 and 2.0 support (list glslang)
("python-mako" ,python-mako) '())))
("which" ,(@ (gnu packages base) which))))
(outputs '("out" "bin")) (outputs '("out" "bin"))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -519,11 +517,11 @@ from software emulation to complete hardware acceleration for modern GPUs.")
((#:configure-flags flags) ((#:configure-flags flags)
`(cons "-Dgallium-opencl=standalone" ,flags)))) `(cons "-Dgallium-opencl=standalone" ,flags))))
(inputs (inputs
`(("libclc" ,libclc) (modify-inputs (package-inputs mesa)
,@(package-inputs mesa))) (prepend libclc)))
(native-inputs (native-inputs
`(("clang" ,clang-11) (modify-inputs (package-native-inputs mesa)
,@(package-native-inputs mesa))))) (prepend clang-11)))))
(define-public mesa-opencl-icd (define-public mesa-opencl-icd
(package/inherit mesa-opencl (package/inherit mesa-opencl