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

On my system OpenGL with bumblebee seems to require libudev in LD_LIBRARY_PATH. Fix that, fix bumblebee module loading and make the socket group configurable

Browse Source
This commit is contained in:
Michael Raskin 2014-05-02 14:32:47 +04:00
parent de26954b30
commit eef9a8ac2a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/hardware/opengl.nix
View File

@ -16,6 +16,7 @@ let
[ p.mesa_drivers [ p.mesa_drivers
p.mesa_noglu # mainly for libGL p.mesa_noglu # mainly for libGL
(if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc) (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc)
p.udev
]; ];
}; };

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

@ -17,6 +17,12 @@ with lib;
Only nvidia driver is supported so far. Only nvidia driver is supported so far.
''; '';
}; };
hardware.bumblebee.group = mkOption {
default = "wheel";
example = "video";
type = types.uniq types.str;
description = ''Group for bumblebee socket'';
};
}; };
config = mkIf config.hardware.bumblebee.enable { config = mkIf config.hardware.bumblebee.enable {
@ -29,13 +35,15 @@ with lib;
systemd.services.bumblebeed = { systemd.services.bumblebeed = {
description = "Bumblebee Hybrid Graphics Switcher"; description = "Bumblebee Hybrid Graphics Switcher";
wantedBy = [ "display-manager.service" ]; wantedBy = [ "display-manager.service" ];
script = "bumblebeed --use-syslog"; script = "bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}";
path = [ kernel.bbswitch pkgs.bumblebee ]; path = [ kernel.bbswitch pkgs.bumblebee ];
serviceConfig = { serviceConfig = {
Restart = "always"; Restart = "always";
RestartSec = 60; RestartSec = 60;
CPUSchedulingPolicy = "idle"; CPUSchedulingPolicy = "idle";
}; };
environment.LD_LIBRARY_PATH="/run/opengl-driver/lib/";
environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
}; };
}; };
} }