nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-14 02:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesa: use LLVM 15, remove global spirv-translator override

Browse Source
This commit is contained in:
Vladimír Čunát 2023-01-28 09:07:46 +01:00 committed by K900
parent f4a78e4b2c
commit ea8fb54acb
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@
, cmake
, rustc
, rust-bindgen
, spirv-llvm-translator_14
, spirv-llvm-translator
}:
/** Packaging design:
@ -44,11 +44,17 @@ let
withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm;
# 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' = rust-bindgen.override {
rust-bindgen-unwrapped = rust-bindgen.unwrapped.override {
clang = llvmPackages.clang;
};
};
spirv-llvm-translator' = spirv-llvm-translator.override {
inherit (llvmPackages) llvm;
};
self = stdenv.mkDerivation {
pname = "mesa";
@ -146,7 +152,7 @@ self = stdenv.mkDerivation {
] ++ lib.optionals (lib.elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
++ lib.optionals stdenv.isDarwin [ libunwind ]
++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator_14 ]
++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator' ]
++ lib.optional withValgrind valgrind-light
# Mesa will not build zink when gallium-drivers=auto
++ lib.optional (lib.elem "zink" galliumDrivers) vulkan-loader;

4
pkgs/top-level/all-packages.nix
View File

@ -15913,8 +15913,6 @@ with pkgs;
spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { };
spirv-llvm-translator_14 = callPackage ../development/compilers/spirv-llvm-translator { llvm = llvm_14; };
sqldeveloper = callPackage ../development/tools/database/sqldeveloper {
jdk = oraclejdk;
};
@ -22035,7 +22033,7 @@ with pkgs;
libGLU = mesa_glu;
mesa = callPackage ../development/libraries/mesa {
llvmPackages = llvmPackages_latest;
llvmPackages = llvmPackages_15;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) OpenGL;
inherit (darwin.apple_sdk_11_0.libs) Xplugin;