Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mesa: apply patch to fix gallium-xa detection #237265

Closed
wants to merge 1 commit into from
Closed

mesa: apply patch to fix gallium-xa detection #237265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions pkgs/development/libraries/mesa/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ self = stdenv.mkDerivation {

./opencl.patch
./disk_cache-include-dri-driver-path-in-cache-key.patch

(fetchpatch {
# mesa: automatically detect gallium-xa
url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/35b440ead5e0713838985361715cc768cfe5f5bc.diff";
hash = "sha256-bDyHhFa0yCZNw/GwuW4EvcsfqvDcgNdg6j/WbAaC3Uc=";
})
];

postPatch = ''
Expand Down Expand Up @@ -214,6 +220,13 @@ self = stdenv.mkDerivation {
"-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}";

# setting mesonAutoFeatures="disabled" breaks mesa's ability to
# resolve defaults that depend on multiple features (for example,
# gallium-xa should be disabled if *none of* a certain set of
# drivers are enabled) and would require us to replicate that
# defaulting logic here in nixpkgs and also keep it in sync.
mesonAutoFeatures = "auto";

buildInputs = with xorg; [
expat llvmPackages.libllvm libglvnd xorgproto
libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
Expand Down