diff options
author | K900 <me@0upti.me> | 2023-12-14 14:40:42 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2023-12-14 14:43:34 +0300 |
commit | 4f9b3a7ec30f0a00d904f57084978df84ac43587 (patch) | |
tree | 633aa6b0152550cb306745340934e1f2c03b2997 /pkgs/development/libraries/mesa | |
parent | abd1d7f93319df76c6fee7aee7ecd39ec6136d62 (diff) |
mesa: use default llvmPackages
Hopefully we can bump this often enough now...
Diffstat (limited to 'pkgs/development/libraries/mesa')
-rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 8e320f54ee8c5..4d8df1d9f0788 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -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; [ |