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

bumblebee service: Fix pmMethod bbswitch check #23014

Merged
merged 1 commit into from
Feb 20, 2017
Merged

bumblebee service: Fix pmMethod bbswitch check #23014

merged 1 commit into from
Feb 20, 2017

Conversation

zraexy
Copy link
Member

@zraexy zraexy commented Feb 20, 2017

Motivation for this change

Made useBbswitch work when pmMethod is "auto" and removed invalid pmMethod option "nouveau".

Without this when using the nvidia drivers bumblebeed looks for bbswitch and fails to find it because it is not included.

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
    • Linux
  • 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.

Made useBbswitch work when pmMethod is "auto" and removed invalid pmMethod option "nouveau".
@mention-bot
Copy link

@zraexy, thanks for your PR! By analyzing the history of the files in this pull request, we identified @paraseba, @abbradar and @ktosiek to be potential reviewers.

@abbradar
Copy link
Member

Ouch, nouveau is accidential leak of my out-of-tree patches. Thanks!

@abbradar abbradar merged commit d8fb60d into NixOS:master Feb 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants