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

nvidia-x11: revert "add an assert that useSettings implies more tha… #283729

Merged
merged 1 commit into from
Jan 25, 2024

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Jan 25, 2024

…n libsOnly"

THe change caused nixGL instantiation failures:

I missed the fact that there is no easy way to oberride useSettings as it's an internal argument as ollosed to useLibs.

Instead of fixing it let's revert it back and try again later.

This reverts commit 9c51fb0.

Description of changes

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.

…n `libsOnly`"

THe change caused nixGL instantiation failures:

- nix-community/nixGL#157
- nix-community/nixGL#154

I missed the fact that there is no easy way to oberride `useSettings` as
it's an internal argument as ollosed to `useLibs`.

Instead of fixing it let's revert it back and try again later.

This reverts commit 9c51fb0.
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 25, 2024
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 25, 2024
@NickCao NickCao merged commit 31766fc into NixOS:master Jan 25, 2024
27 checks passed
@trofi trofi deleted the nvidia-x11-revert-useLibs-assert branch January 25, 2024 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants