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

Use libXNVCtrl purely #318092

Merged
merged 2 commits into from
Jun 8, 2024
Merged

Use libXNVCtrl purely #318092

merged 2 commits into from
Jun 8, 2024

Conversation

aidalgol
Copy link
Contributor

@aidalgol aidalgol commented Jun 7, 2024

Description of changes

libXNVCtrl is not tied to the Nvidia driver version, so we don't need to apply it via the NixOS option hardware.opengl.extraPackages, and can instead let consumers of the library use it via the derivation directly.

Closes #314289.

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.

This library does not actually need to match the Nvidia driver version,
so we do not need to make it available impurely.

This reverts the following commits.
9b3461e
4e353b6
Put the path to libXNVCtrl on the RPATH of the MangoHUD binary.
Copy link
Contributor

@kira-bruneau kira-bruneau left a comment

Choose a reason for hiding this comment

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

Thanks @aidalgol! The change looks good to me - but I don't have an nvidia device to test this on right now.

Copy link
Contributor

@Kiskae Kiskae left a comment

Choose a reason for hiding this comment

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

Makes sense, it's an X extension with embedded version support, the client should check that the corresponding server has the support it requires.

@kira-bruneau kira-bruneau merged commit 783a966 into NixOS:master Jun 8, 2024
28 of 29 checks passed
@aidalgol aidalgol deleted the libxnvctrl-pure branch June 12, 2024 09:29
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.

linuxPackages.nvidia_x11.settings.libXNVCtrl: reconsider impure deployment
3 participants