Skip to content

[staging] Vulkan updates#228870

Merged
K900 merged 2 commits intoNixOS:staging-nextfrom
K900:vulkan-updates
Apr 29, 2023
Merged

[staging] Vulkan updates#228870
K900 merged 2 commits intoNixOS:staging-nextfrom
K900:vulkan-updates

Conversation

@K900
Copy link
Contributor

@K900 K900 commented Apr 29, 2023

Description of changes

Those aren't part of a LunarG SDK release yet, but Yuzu (TBD) needs 1.3.246 or above, so provide that.

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.

@K900 K900 requested review from PedroHLC and vcunat April 29, 2023 08:37
@ofborg ofborg bot requested a review from Ralith April 29, 2023 08:55
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Apr 29, 2023
@PedroHLC
Copy link
Member

That's not how we usually handle Vulkan-* things. Only Yuzu depends on it, and we just override it for Yuzu.

But, the only benefit from keeping this SDK-strict, is not changing the hash so frequently. So I'm not opposed to changing it, just stating the obvious here.

@K900
Copy link
Contributor Author

K900 commented Apr 29, 2023

I'm hoping we get a new SDK release by the next staging-next, personally, but this will also probably be useful for other things soon.

@K900 K900 changed the base branch from staging to staging-next April 29, 2023 16:19
@K900 K900 merged commit b3a0bb7 into NixOS:staging-next Apr 29, 2023
PedroHLC added a commit to PedroHLC/nixpkgs that referenced this pull request May 4, 2023
This reverts commit b3a0bb7, reversing
changes made to b2f87d7.
PedroHLC added a commit to PedroHLC/nixpkgs that referenced this pull request May 4, 2023
This reverts commit b3a0bb7, reversing
changes made to b2f87d7.
Atemu added a commit to Atemu/nixpkgs that referenced this pull request May 14, 2023
The VK loader finds the 32-bit layer first and does not attempt to load the
64-bit layer afterwards; likely because it shares the same name. Simply giving
them different names fixes the issue; both layers are tried and the correct one
succeeds.

A similar patter is employed by obs-vkcapture which continued working after
NixOS#228870.

Fixes NixOS#230978
kira-bruneau pushed a commit to kira-bruneau/nur-packages that referenced this pull request May 24, 2023
The VK loader finds the 32-bit layer first and does not attempt to load the
64-bit layer afterwards; likely because it shares the same name. Simply giving
them different names fixes the issue; both layers are tried and the correct one
succeeds.

A similar patter is employed by obs-vkcapture which continued working after
NixOS/nixpkgs#228870.

Fixes NixOS/nixpkgs#230978
@K900 K900 deleted the vulkan-updates branch July 27, 2025 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants