-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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.
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
Even more more vulkan updates #229749
Even more more vulkan updates #229749
Conversation
vulkan-headers | ||
wayland | ||
]; | ||
|
||
cmakeFlags = [ | ||
"-DGLSLANG_INSTALL_DIR=${glslang}" | ||
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" | ||
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers'}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, intentional to use the override above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh :D sorry mb
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know if there's precedent for using '
this way in nixpkgs, but I think it makes for pretty poor readability.
# the next SPIRV headers release. | ||
# FIXME: if this ever becomes common, figure out a way to pull revisions directly | ||
# from upstream known-good.json | ||
spirv-headers' = spirv-headers.overrideAttrs(_: { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's okay on how it is now. But next time a Nintendo emulator requires these amount of error-prone diffs, we should just override in it instead. The Vulkan SDK still looks more appropriate for a distro to supply.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree that we should stick to SDK releases.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not just a Nintendo emulator, it's entirely possible for those extensions to be used by other things as well, e.g. DXVK. It may be a better idea to build the validation layers and other development tools with the SDK versions of everything, but use the latest headers and loader by default.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's possible for stuff to use bleeding edge interfaces, yeah, but quite rare for people to front run the SDK in my experience. Stable nixpkgs will inevitably lag regardless; better that it lag at a well-defined, supported point.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm kinda hoping we can nudge upstream into just having proper spec-versioned tags for everything, and then this just won't be an issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Filed upstream: KhronosGroup/SPIRV-Headers#345
Description of changes
Fixes build for vulkan-validation-layers and vulkan-tools-lunarg, with some crimes.
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)