lol

vaapiIntel: rename to intel-vaapi-driver

I tripped over this way to often and a package attr matching the pname
is way nicer, anyway.

+10 -9
+1 -1
nixos/doc/manual/configuration/gpu-accel.chapter.md
··· 189 189 190 190 ```nix 191 191 hardware.opengl.extraPackages = [ 192 - vaapiIntel 192 + intel-vaapi-driver 193 193 ]; 194 194 ``` 195 195
+4 -4
nixos/modules/hardware/opengl.nix
··· 87 87 extraPackages = mkOption { 88 88 type = types.listOf types.package; 89 89 default = []; 90 - example = literalExpression "with pkgs; [ intel-media-driver intel-ocl vaapiIntel ]"; 90 + example = literalExpression "with pkgs; [ intel-media-driver intel-ocl intel-vaapi-driver ]"; 91 91 description = lib.mdDoc '' 92 92 Additional packages to add to OpenGL drivers. 93 93 This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. 94 94 95 95 ::: {.note} 96 - intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained vaapiIntel driver. 96 + intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained intel-vaapi-driver driver. 97 97 ::: 98 98 ''; 99 99 }; ··· 101 101 extraPackages32 = mkOption { 102 102 type = types.listOf types.package; 103 103 default = []; 104 - example = literalExpression "with pkgs.pkgsi686Linux; [ intel-media-driver vaapiIntel ]"; 104 + example = literalExpression "with pkgs.pkgsi686Linux; [ intel-media-driver intel-vaapi-driver ]"; 105 105 description = lib.mdDoc '' 106 106 Additional packages to add to 32-bit OpenGL drivers on 64-bit systems. 107 107 Used when {option}`driSupport32Bit` is set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. 108 108 109 109 ::: {.note} 110 - intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained vaapiIntel driver. 110 + intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained intel-vaapi-driver driver. 111 111 ::: 112 112 ''; 113 113 };
+2 -2
pkgs/development/libraries/libva/default.nix
··· 7 7 , intel-compute-runtime 8 8 , intel-media-driver 9 9 , mpv 10 - , vaapiIntel 10 + , intel-vaapi-driver 11 11 , vlc 12 12 }: 13 13 ··· 40 40 passthru.tests = { 41 41 # other drivers depending on libva and selected application users. 42 42 # Please get a confirmation from the maintainer before adding more applications. 43 - inherit intel-compute-runtime intel-media-driver vaapiIntel mpv vlc; 43 + inherit intel-compute-runtime intel-media-driver intel-vaapi-driver mpv vlc; 44 44 }; 45 45 46 46 meta = with lib; {
pkgs/development/libraries/vaapi-intel/default.nix pkgs/development/libraries/intel-vaapi-driver/default.nix
+1
pkgs/top-level/aliases.nix
··· 1712 1712 1713 1713 v4l_utils = v4l-utils; # Added 2019-08-07 1714 1714 vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 1715 + vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 1715 1716 vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; 1716 1717 varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26 1717 1718 varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26
+2 -2
pkgs/top-level/all-packages.nix
··· 20209 20209 inherit (pkgsi686Linux) 20210 20210 amdvlk 20211 20211 intel-media-driver 20212 + intel-vaapi-driver 20212 20213 mesa 20213 - vaapiIntel 20214 20214 libvdpau-va-gl 20215 20215 vaapiVdpau 20216 20216 beignet ··· 24464 24464 24465 24465 v8 = darwin.apple_sdk_11_0.callPackage ../development/libraries/v8 { }; 24466 24466 24467 - vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; 24467 + intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; 24468 24468 24469 24469 vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; 24470 24470