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

dxvk: change targetPlatform to hostPlatform #267291

Closed
wants to merge 1 commit into from
Closed

dxvk: change targetPlatform to hostPlatform #267291

wants to merge 1 commit into from

Conversation

ghost
Copy link

@ghost ghost commented Nov 13, 2023

Description of changes

stdenv.targetPlatform really shouldn't be used by software that doesn't generate or manipulate binaries.

I did a mass replacement in #267229 and this was the only package for which the change affected eval on Linux, so I'm putting it in a
separate PR.

If the previous behavior was correct, we should document why targetPlatform is used here.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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.11 Release Notes (or backporting 23.05 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.

@kjeremy
Copy link
Contributor

kjeremy commented Nov 13, 2023

It looks like this changes a lot more than dxvk.

@reckenrode
Copy link
Contributor

It looks like the commit from #267291 got pulled into this PR.

The reason for the eval change is the isCross check is broken. DXVK was building using nixpkgs’s support for cross-compilation rather than upstream’s cross file. Instead of fixing the check, I opened #267322 to drop it completely.

@ghost ghost marked this pull request as draft November 17, 2023 10:06
stdenv.targetPlatform really shouldn't be used by software that
doesn't generate or manipulate binaries; I think the package was
using the wrong platform.
@ghost
Copy link
Author

ghost commented Nov 17, 2023

It looks like this changes a lot more than dxvk.

It looks like the commit from #267291 got pulled into this PR.

Fixed, thanks.

@ghost ghost marked this pull request as ready for review November 17, 2023 10:07
@ghost
Copy link
Author

ghost commented Nov 17, 2023

Closed in favor of

@ghost ghost closed this Nov 17, 2023
@ghost ghost deleted the pr/dxvk/targetPlatform branch November 17, 2023 10:08
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants