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

steam/fhsenv: use normal curl #340710

Merged
merged 1 commit into from
Sep 9, 2024
Merged

steam/fhsenv: use normal curl #340710

merged 1 commit into from
Sep 9, 2024

Conversation

K900
Copy link
Contributor

@K900 K900 commented Sep 9, 2024

Description of changes

The Steam Runtime can handle any curl version:
https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/blob/main/libcurl-compat/README.md?ref_type=heads

And nix-built applications run from Steam will start exploding on this after staging-next because we're finally building our curl with versioned symbols.

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.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

The Steam Runtime can handle any curl version:
https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/blob/main/libcurl-compat/README.md?ref_type=heads

And nix-built applications run from Steam will start exploding on this after staging-next
because we're finally building our curl with versioned symbols.
K900 added a commit to K900/aagl-gtk-on-nix that referenced this pull request Sep 9, 2024
This replicates the change from NixOS/nixpkgs#340710

But also, all of wrapAAGL is a huge mess with Steam-specific hacks copied from nixpkgs, which should really be cleaned up/removed.
@ofborg ofborg bot requested a review from jagajaga September 9, 2024 08:58
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

didn't test but I really like the idea

@K900
Copy link
Contributor Author

K900 commented Sep 9, 2024

Tested this on a bunch of things and nothing broke.

@K900 K900 merged commit d09f96c into NixOS:master Sep 9, 2024
39 checks passed
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