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

sunshine: use pkgs.autoAddDriverRunpath #300287

Merged
merged 2 commits into from
Apr 1, 2024
Merged

Conversation

jonringer
Copy link
Contributor

Description of changes

Part of #141803

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.

@ofborg ofborg bot requested a review from devusb March 30, 2024 18:29
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Mar 30, 2024
@devusb
Copy link
Contributor

devusb commented Mar 30, 2024

@jonringer I think this may still need autoPatchelfHook for some vendored libraries or it will crash on run, but I’ll test and let you know.

@jonringer
Copy link
Contributor Author

@jonringer I think this may still need autoPatchelfHook for some vendored libraries or it will crash on run, but I’ll test and let you know.

Yea, I always call it now. I feel like a dlopen sometimes working is better than it always failing?

@@ -84,10 +85,10 @@ stdenv'.mkDerivation rec {
nativeBuildInputs = [
cmake
pkg-config
autoPatchelfHook
autoAddDriverRunpath
Copy link
Contributor

Choose a reason for hiding this comment

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

Moved out of optionals

Copy link
Contributor

@devusb devusb left a comment

Choose a reason for hiding this comment

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

LGTM, tested working same as before with AMD+Wayland -- don't have NVIDIA to test cudaSupport specifically though.

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Apr 1, 2024
@wegank wegank merged commit 86aee6e into NixOS:master Apr 1, 2024
24 of 25 checks passed
@jonringer jonringer deleted the sunshine-autoadd branch April 2, 2024 00:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants