diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-12-11 17:34:37 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-12-11 17:44:48 +0100 |
commit | 8f99f34194330846742f9fca77eb3d6295455801 (patch) | |
tree | f00a8119944fee40b9d3af989936e4bb0df89216 /nixos/modules | |
parent | 39d52bc01066ba96345d7e237b5d2a64852442da (diff) | |
download | nixpkgs-8f99f34194330846742f9fca77eb3d6295455801.tar nixpkgs-8f99f34194330846742f9fca77eb3d6295455801.tar.gz nixpkgs-8f99f34194330846742f9fca77eb3d6295455801.tar.bz2 nixpkgs-8f99f34194330846742f9fca77eb3d6295455801.tar.lz nixpkgs-8f99f34194330846742f9fca77eb3d6295455801.tar.xz nixpkgs-8f99f34194330846742f9fca77eb3d6295455801.tar.zst nixpkgs-8f99f34194330846742f9fca77eb3d6295455801.zip |
nixos/opengl: cleanup suggestions for extraPackages
- libvdpau-va-gl supports only H.264 - vaapiVdpau is unmaintained for 10 years
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/hardware/opengl.nix | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 5a5d88d9a4e..9108bcbd165 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -26,9 +26,7 @@ in imports = [ (mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ]) - (mkRemovedOptionModule [ "hardware" "opengl" "s3tcSupport" ] '' - S3TC support is now always enabled in Mesa. - '') + (mkRemovedOptionModule [ "hardware" "opengl" "s3tcSupport" ] "S3TC support is now always enabled in Mesa.") ]; options = { @@ -89,21 +87,28 @@ in extraPackages = mkOption { type = types.listOf types.package; default = []; - example = literalExpression "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; + example = literalExpression "with pkgs; [ intel-media-driver intel-ocl vaapiIntel ]"; description = lib.mdDoc '' - Additional packages to add to OpenGL drivers. This can be used - to add OpenCL drivers, VA-API/VDPAU drivers etc. + Additional packages to add to OpenGL drivers. + This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. + + ::: {.note} + intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained vaapiIntel driver. + ::: ''; }; extraPackages32 = mkOption { type = types.listOf types.package; default = []; - example = literalExpression "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; + example = literalExpression "with pkgs.pkgsi686Linux; [ intel-media-driver vaapiIntel ]"; description = lib.mdDoc '' - Additional packages to add to 32-bit OpenGL drivers on - 64-bit systems. Used when {option}`driSupport32Bit` is - set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. + Additional packages to add to 32-bit OpenGL drivers on 64-bit systems. + Used when {option}`driSupport32Bit` is set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. + + ::: {.note} + intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained vaapiIntel driver. + ::: ''; }; @@ -124,7 +129,6 @@ in }; config = mkIf cfg.enable { - assertions = [ { assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64; message = "Option driSupport32Bit only makes sense on a 64-bit system."; |