mesa: fix building with llvm

Use glslang's bin output in nativeBuildInputs to prevent propagating the "dev" output which
then injects the glslang libraries for host into target. Switch to using
the spirv-tools package for buildInputs instead of glslang to further
prevent the wrong things from propagating on host since we only need the
pkg-config and static libraries.
This commit is contained in:
Tristan Ross
2024-08-04 21:50:03 -07:00
parent 423c64a625
commit 6c159d5034
+5 -2
View File
@@ -10,6 +10,7 @@
, file
, flex
, glslang
, spirv-tools
, intltool
, jdupes
, libdrm
@@ -226,7 +227,7 @@ in stdenv.mkDerivation {
directx-headers
elfutils
expat
glslang
spirv-tools
libglvnd
libomxil-bellagio
libunwind
@@ -275,7 +276,9 @@ in stdenv.mkDerivation {
python3Packages.mako
python3Packages.ply
jdupes
glslang
# Use bin output from glslang to not propagate the dev output at
# the build time with the host glslang.
(lib.getBin glslang)
rustc
rust-bindgen
rust-cbindgen