dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

mesa: use default llvmPackages

Browse Source 
Hopefully we can bump this often enough now...
This commit is contained in:
K900 2023-12-14 14:40:42 +03:00
parent abd1d7f933
commit 4f9b3a7ec3
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/mesa/default.nix
View File

@ -2,7 +2,7 @@
, meson, pkg-config, ninja
, intltool, bison, flex, file, python3Packages, wayland-scanner
, expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages_16, libffi, libomxil-bellagio, libva-minimal
, llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau
, libglvnd, libunwind, lm_sensors
, vulkan-loader, glslang
@ -65,6 +65,7 @@
, enableOpenCL ? stdenv.isLinux && stdenv.isx86_64
, enablePatentEncumberedCodecs ? true
, jdupes
, rust-bindgen
, rustc
, spirv-llvm-translator
, zstd
@ -93,19 +94,6 @@ let
withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm;
llvmPackages = llvmPackages_16;
# Align all the Mesa versions used. Required to prevent explosions when
# two different LLVMs are loaded in the same process.
# FIXME: these should really go into some sort of versioned LLVM package set
rust-bindgen' = buildPackages.rust-bindgen.override {
rust-bindgen-unwrapped = buildPackages.rust-bindgen.unwrapped.override {
clang = buildPackages.llvmPackages_16.clang;
};
};
spirv-llvm-translator' = spirv-llvm-translator.override {
inherit (llvmPackages) llvm;
};
haveWayland = lib.elem "wayland" eglPlatforms;
haveZink = lib.elem "zink" galliumDrivers;
haveDozen = (lib.elem "d3d12" galliumDrivers) || (lib.elem "microsoft-experimental" vulkanDrivers);
@ -245,7 +233,7 @@ self = stdenv.mkDerivation {
python3Packages.python # for shebang
] ++ lib.optionals haveWayland [ wayland wayland-protocols ]
++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ]
++ lib.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator' ]
++ lib.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator ]
++ lib.optional withValgrind valgrind-light
++ lib.optional haveZink vulkan-loader
++ lib.optional haveDozen directx-headers;
@ -258,7 +246,7 @@ self = stdenv.mkDerivation {
intltool bison flex file
python3Packages.python python3Packages.mako python3Packages.ply
jdupes glslang
] ++ lib.optionals enableOpenCL [ rust-bindgen' rustc ]
] ++ lib.optionals enableOpenCL [ rust-bindgen rustc ]
++ lib.optional haveWayland wayland-scanner;
propagatedBuildInputs = with xorg; [