public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23014 from zraexy/zraexy-bumblebee-pmmethod

Browse Source 
bumblebee service: Fix pmMethod bbswitch check
This commit is contained in:
Nikolay Amiantov 2017-02-20 16:18:45 +03:00 committed by GitHub
commit d8fb60d1d4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/hardware/video/bumblebee.nix
View File

@ -13,7 +13,7 @@ let
useDisplayDevice = cfg.connectDisplay; useDisplayDevice = cfg.connectDisplay;
}; };
useBbswitch = cfg.pmMethod == "bbswitch"; useBbswitch = cfg.pmMethod == "bbswitch" || cfg.pmMethod == "auto" && useNvidia;
primus = pkgs.primus.override { primus = pkgs.primus.override {
inherit useNvidia; inherit useNvidia;
@ -65,7 +65,7 @@ in
pmMethod = mkOption { pmMethod = mkOption {
default = "auto"; default = "auto";
type = types.enum [ "auto" "bbswitch" "nouveau" "switcheroo" "none" ]; type = types.enum [ "auto" "bbswitch" "switcheroo" "none" ];
description = '' description = ''
Set preferred power management method for unused card. Set preferred power management method for unused card.
''; '';