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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

steam: add extraCompatPackages #293564

Merged
merged 1 commit into from
Mar 8, 2024
Merged

Conversation

Shawn8901
Copy link
Contributor

@Shawn8901 Shawn8901 commented Mar 5, 2024

Description of changes

This PR adds an extra option for the steam module to define compat tools via declaration.
One has to provide a valid proton derivation to let it appear in the steams proton list.
What defines a valid proton derivation could be looked up here: https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/blob/393bb134fc01f96d68925d6bfe300d58b97744ac/docs/steam-compat-tool-interface.md

This supersedes #189398. The option declaration is the same, but does not apply the environment variable globally but just on the steam wrapper.

For testing purposes one could either use the proton-ge that is have in my personal flake https://github.com/Shawn8901/nix-configuration/blob/main/packages/proton-ge-custom/default.nix or that one which is in the NUR https://github.com/nix-community/nur-combined/blob/master/repos/ataraxiasjel/pkgs/proton-ge/default.nix

sadly there is at the moment no custom proton runtime in nixpkgs at the moment (or at least i did not find any).

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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.

Add a 馃憤 reaction to pull requests you find important.

Copy link
Member

@PedroHLC PedroHLC left a comment

Choose a reason for hiding this comment

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

Proper

Copy link
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

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

Couple minor things but otherwise the diff LGTM.

I'll hopefully have time to test it this week but it really ought to work.

nixos/modules/programs/steam.nix Outdated Show resolved Hide resolved
Comment on lines 80 to 81
luxtorpeda
proton-ge
Copy link
Member

Choose a reason for hiding this comment

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

Are these two in Nixpkgs? If not, remove them or add a note about that and where to get these.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

as written in the pr description, there is no proton derivation in nixpkgs atm, so i removed that.

nixos/modules/programs/steam.nix Outdated Show resolved Hide resolved
@Shawn8901 Shawn8901 force-pushed the steam-compat-tools branch 2 times, most recently from 92d878b to d24c0d5 Compare March 6, 2024 19:21
@thiagokokada thiagokokada merged commit 488f218 into NixOS:master Mar 8, 2024
24 checks passed
K900 added a commit to K900/nixpkgs that referenced this pull request Mar 8, 2024
K900 added a commit that referenced this pull request Mar 8, 2024
@Shawn8901 Shawn8901 deleted the steam-compat-tools branch March 8, 2024 12:06
@Lord-Valen Lord-Valen added the backport release-23.11 Backport PR automatically label Mar 15, 2024
Copy link
Contributor

Successfully created backport PR for release-23.11:

@Shawn8901
Copy link
Contributor Author

@Lord-Valen be aware that there is some refactoring ongoing for improving how compat tools could be defined, not sure if that should go to stable alone. see #296009

Lord-Valen pushed a commit to Lord-Valen/nixpkgs that referenced this pull request Mar 17, 2024
@Lord-Valen Lord-Valen added the 8.has: port to stable A PR already has a backport to the stable release. label Mar 29, 2024
Copy link
Contributor

Backport failed for release-23.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-23.11
git worktree add -d .worktree/backport-293564-to-release-23.11 origin/release-23.11
cd .worktree/backport-293564-to-release-23.11
git switch --create backport-293564-to-release-23.11
git cherry-pick -x 93a891f0e8e0feb96090eac48d9a2d5aaad28f20

@Lord-Valen Lord-Valen removed the backport release-23.11 Backport PR automatically label Mar 29, 2024
zeme-wana pushed a commit to input-output-hk/nixpkgs that referenced this pull request May 8, 2024
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.

None yet

6 participants