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.

Sign up for GitHub

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

Jump to bottom

Backport Steam fix to 17.09 #32721

Merged
merged 1 commit into from Dec 15, 2017
Merged

Backport Steam fix to 17.09 #32721

merged 1 commit into from Dec 15, 2017

Conversation

lukateras
Copy link
Member

@lukateras lukateras commented Dec 15, 2017 •
edited

Motivation for this change

This is needed for Steam which expects run.sh to print runtime library paths.

Fixes #32687. Original commit: 459e4b7

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@orivej
Copy link
Contributor

orivej commented Dec 15, 2017

Please include the reference to the original commit in the commit message: https://nixos.org/nixpkgs/manual/#idm140737317027664

@abbradar @lukateras
steam: add /steamrt/run.sh
1b0dd72 
This is needed for Steam which expects run.sh to print runtime library paths.

Fixes NixOS#32687.

(cherry picked from 459e4b7)
@lukateras
Copy link
Member Author

lukateras commented Dec 15, 2017 •
edited

@orivej Done!

@orivej orivej merged commit 6778ee3 into NixOS:release-17.09 Dec 15, 2017
@lukateras
Copy link
Member Author

lukateras commented Dec 15, 2017 •
edited

Thank you! And sorry for pinging you back earlier asking to backport this: didn't think through that I can open the PR with backport myself :-)

@pbogdan
Copy link
Member

pbogdan commented Dec 15, 2017 •
edited

Note that there is no steam-runtime-wrapped(-i686) (only steam-runtime(-i686)) in scope so as is this seems to trigger an eval error..

orivej added a commit that referenced this pull request Dec 15, 2017
@orivej
Revert "Merge pull request #32721 from yegortimoshenko/steam/13-dec"
c1d1ef6 
This reverts commit 6778ee3, reversing
changes made to 711379f.

#32721 (comment)

steam-runtime-wrapped is not yet available on the release branch.
@orivej
Copy link
Contributor

orivej commented Dec 15, 2017

@pbogdan Thank you for such a quick notice, reverted for @yegortimoshenko to fix it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: steam
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lukateras @orivej @pbogdan @abbradar