dxvk: refactor based on post-merge feedback and bump to 1.10.1 #163474
Conversation
This file contains 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
- Move the synchronization primitive changes to their own patch, so it can be applied conditionally on Darwin. Also, document why this change is needed; and - Refactor how `src` is handled to support allowing Darwin and Linux to diverge in case the Darwin patches do not apply to the latest version. This should address some post-merger concerns that were raised about Darwin’s blocking updates for Linux.
While it’s unlikely, it’s possible that different MoltenVK versions could require their own compatability patches. Support that by making the `moltenvk` derivation provide the patch via `passthru`. There is no package with the patch applied because the patch should never be used by anything other than DXVK.
|
Result of 1 package built:
|
|
Result of 1 package built:
|
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
|
Bumped DXVK to 1.10.1 while the PR is open. |
reckenrode
changed the title
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.
Description of changes
I received some post-merge feedback on #161522 raising concerns that Darwin could block updates on Linux. I’ve refactored the derivation to address those concerns without cluttering up the derivation too much or requiring separate upstream sources for Darwin and Linux.
I also moved the DXVK compatibility patch to a passthru attribute on
darwin.moltenvk. Per @Gcenx, I do not want to provide a package for a patched MoltenVK because it should never be used except with DXVK. Both derivations have several comments emphasizing this. The patch was moved in case different versions of MoltenVK require their own patches.@Atemu pinging you to see if this addresses your concerns
Things done
sandbox = trueset 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/)nixos/doc/manual/md-to-db.shto update generated release notes