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.

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

Merged
merged 2 commits into from
May 4, 2023
Merged

Conversation

K900
Copy link
Contributor

@K900 K900 commented May 3, 2023

Description of changes

Fixes build for vulkan-validation-layers and vulkan-tools-lunarg, with some crimes.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

vulkan-headers
wayland
];

cmakeFlags = [
"-DGLSLANG_INSTALL_DIR=${glslang}"
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers'}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo?

Copy link
Contributor Author

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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh :D sorry mb

Copy link
Contributor

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.

@dev-null-undefined dev-null-undefined mentioned this pull request May 3, 2023
12 tasks
@ofborg ofborg bot requested review from Ralith and expipiplus1 May 3, 2023 21:58
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels May 3, 2023
# 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(_: {
Copy link
Member

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.

Copy link
Contributor

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.

Copy link
Contributor Author

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.

Copy link
Contributor

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.

Copy link
Contributor Author

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@K900 K900 merged commit 3428bdf into NixOS:master May 4, 2023
PedroHLC added a commit to PedroHLC/nixpkgs that referenced this pull request May 4, 2023
…an-updates"

This reverts commit 3428bdf, reversing
changes made to 63464b8.
PedroHLC added a commit to PedroHLC/nixpkgs that referenced this pull request May 4, 2023
…an-updates"

This reverts commit 3428bdf, reversing
changes made to 63464b8.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants