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

opengl service: move options under common hardware.opengl tree 

Purely cosmetic.
This commit is contained in:
Nikolay Amiantov 2018-03-17 18:53:06 +03:00
parent 0934c8f49b
commit d61e6c5ed7
1 changed files with 78 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,89 +33,92 @@ in
{ {
options = { options = {
hardware.opengl.enable = mkOption {
description = ''
Whether to enable OpenGL drivers. This is needed to enable
OpenGL support in X11 systems, as well as for Wayland compositors
like sway, way-cooler and Weston. It is enabled by default
by the corresponding modules, so you do not usually have to
set it yourself, only if there is no module for your wayland
compositor of choice. See services.xserver.enable,
programs.sway.enable, and programs.way-cooler.enable.
'';
type = types.bool;
default = false;
};
hardware.opengl.driSupport = mkOption { hardware.opengl = {
type = types.bool; enable = mkOption {
default = true; description = ''
description = '' Whether to enable OpenGL drivers. This is needed to enable
Whether to enable accelerated OpenGL rendering through the OpenGL support in X11 systems, as well as for Wayland compositors
Direct Rendering Interface (DRI). like sway, way-cooler and Weston. It is enabled by default
''; by the corresponding modules, so you do not usually have to
}; set it yourself, only if there is no module for your wayland
compositor of choice. See services.xserver.enable,
programs.sway.enable, and programs.way-cooler.enable.
'';
type = types.bool;
default = false;
};
hardware.opengl.driSupport32Bit = mkOption { driSupport = mkOption {
type = types.bool; type = types.bool;
default = false; default = true;
description = '' description = ''
On 64-bit systems, whether to support Direct Rendering for Whether to enable accelerated OpenGL rendering through the
32-bit applications (such as Wine). This is currently only Direct Rendering Interface (DRI).
supported for the <literal>nvidia</literal> and '';
<literal>ati_unfree</literal> drivers, as well as };
<literal>Mesa</literal>.
'';
};
hardware.opengl.s3tcSupport = mkOption { driSupport32Bit = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
description = '' description = ''
Make S3TC(S3 Texture Compression) via libtxc_dxtn available On 64-bit systems, whether to support Direct Rendering for
to OpenGL drivers instead of the patent-free S2TC replacement. 32-bit applications (such as Wine). This is currently only
supported for the <literal>nvidia</literal> and
<literal>ati_unfree</literal> drivers, as well as
<literal>Mesa</literal>.
'';
};
Using this library may require a patent license depending on your location. s3tcSupport = mkOption {
''; type = types.bool;
}; default = false;
description = ''
Make S3TC(S3 Texture Compression) via libtxc_dxtn available
to OpenGL drivers instead of the patent-free S2TC replacement.
hardware.opengl.package = mkOption { Using this library may require a patent license depending on your location.
type = types.package; '';
internal = true; };
description = ''
The package that provides the OpenGL implementation.
'';
};
hardware.opengl.package32 = mkOption { package = mkOption {
type = types.package; type = types.package;
internal = true; internal = true;
description = '' description = ''
The package that provides the 32-bit OpenGL implementation on The package that provides the OpenGL implementation.
64-bit systems. Used when <option>driSupport32Bit</option> is '';
set. };
'';
};
hardware.opengl.extraPackages = mkOption { package32 = mkOption {
type = types.listOf types.package; type = types.package;
default = []; internal = true;
example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; description = ''
description = '' The package that provides the 32-bit OpenGL implementation on
Additional packages to add to OpenGL drivers. This can be used 64-bit systems. Used when <option>driSupport32Bit</option> is
to add OpenCL drivers, VA-API/VDPAU drivers etc. set.
''; '';
}; };
hardware.opengl.extraPackages32 = mkOption { extraPackages = mkOption {
type = types.listOf types.package; type = types.listOf types.package;
default = []; default = [];
example = literalExample "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]";
description = '' description = ''
Additional packages to add to 32-bit OpenGL drivers on Additional packages to add to OpenGL drivers. This can be used
64-bit systems. Used when <option>driSupport32Bit</option> is to add OpenCL drivers, VA-API/VDPAU drivers etc.
set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. '';
''; };
extraPackages32 = mkOption {
type = types.listOf types.package;
default = [];
example = literalExample "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]";
description = ''
Additional packages to add to 32-bit OpenGL drivers on
64-bit systems. Used when <option>driSupport32Bit</option> is
set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc.
'';
};
}; };
}; };