Skip to content

dxvk: change targetPlatform to hostPlatform#267291

Closed
ghost wants to merge 1 commit intomasterfrom
unknown repository
Closed

dxvk: change targetPlatform to hostPlatform#267291
ghost wants to merge 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@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.

@ghost ghost requested a review from adisbladis as a code owner November 13, 2023 20:16
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: emacs Text editor 6.topic: printing Drivers, CUPS & Co. labels Nov 13, 2023
@ghost ghost requested a review from reckenrode November 13, 2023 20:17
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Nov 13, 2023
@kjeremy
Copy link
Copy Markdown
Contributor

kjeremy commented Nov 13, 2023

It looks like this changes a lot more than dxvk.

@reckenrode
Copy link
Copy Markdown
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.
@github-actions github-actions bot removed 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: emacs Text editor 6.topic: printing Drivers, CUPS & Co. labels Nov 17, 2023
@ghost
Copy link
Copy Markdown
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
Copy Markdown
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

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants