mesa: don't specify spirv2dxil output if it's not built#371771
Closed
mvnetbiz wants to merge 1 commit intoNixOS:masterfrom
Closed
mesa: don't specify spirv2dxil output if it's not built#371771mvnetbiz wants to merge 1 commit intoNixOS:masterfrom
mvnetbiz wants to merge 1 commit intoNixOS:masterfrom
Conversation
marcusramberg
approved these changes
Jan 8, 2025
Contributor
marcusramberg
left a comment
There was a problem hiding this comment.
Noticed this when updating asahi mesa to latest from Nixpkgs as well.
Contributor
Author
|
It used to be conditional, but was removed in #319047. It looks like the output may also be produced if microsoft-experimental" is in vulkanDrivers. |
If mesa was overridden to specify a list of gallium drivers that didn't include d3d12, nix would fail the build for not producing the spirv2dxil output.
Contributor
Author
|
If you're trying to make a minimal mesa, you probably have to overrideAttrs a bunch of other stuff too, so maybe just fix it that way instead of adding this back? let
pkgs = import ./. { };
inherit (pkgs) lib;
in
((pkgs.mesa.override {
galliumDrivers = [ "llvmpipe" ];
vulkanDrivers = [ "swrast" ];
libvdpau = null;
}).overrideAttrs (old: {
outputs = lib.remove "spirv2dxil" old.outputs; # relevant line
mesonFlags = old.mesonFlags ++ [
(lib.mesonEnable "gallium-vdpau" false)
(lib.mesonEnable "gallium-va" false)
(lib.mesonEnable "gallium-xa" false)
(lib.mesonBool "gallium-nine" false)
];
})).drivers |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
If mesa was overridden to specify a list of gallium drivers that didn't include d3d12, nix would fail the build for not producing the spirv2dxil output.
Things done
For example this now works, where before it failed with
failed to produce output path for output 'spirv2dxil'.nix-build --expr '((import ./. {}).pkgs.mesa.override { galliumDrivers = [ "llvmpipe" "radeonsi" "i915" ]; vulkanDrivers = [ "swrast" ]; }).drivers'nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.