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

vaapiIntel: rename to intel-vaapi-driver

Browse Source 
I tripped over this way to often and a package attr matching the pname
is way nicer, anyway.
This commit is contained in:
Sandro Jäckel 2023-05-31 15:04:02 +02:00
parent b4da951ec2
commit fdb8f4994a
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/configuration/gpu-accel.chapter.md
View File

@ -189,7 +189,7 @@ Older Intel GPUs use the i965 driver, which can be installed with:
```nix
hardware.opengl.extraPackages = [
vaapiIntel
intel-vaapi-driver
];
```

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

@ -87,13 +87,13 @@ in
extraPackages = mkOption {
type = types.listOf types.package;
default = [];
example = literalExpression "with pkgs; [ intel-media-driver intel-ocl vaapiIntel ]";
example = literalExpression "with pkgs; [ intel-media-driver intel-ocl intel-vaapi-driver ]";
description = lib.mdDoc ''
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.
intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained intel-vaapi-driver driver.
:::
'';
};
@ -101,13 +101,13 @@ in
extraPackages32 = mkOption {
type = types.listOf types.package;
default = [];
example = literalExpression "with pkgs.pkgsi686Linux; [ intel-media-driver vaapiIntel ]";
example = literalExpression "with pkgs.pkgsi686Linux; [ intel-media-driver intel-vaapi-driver ]";
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.
::: {.note}
intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained vaapiIntel driver.
intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained intel-vaapi-driver driver.
:::
'';
};

0
pkgs/development/libraries/vaapi-intel/default.nix → pkgs/development/libraries/intel-vaapi-driver/default.nix
View File

4
pkgs/development/libraries/libva/default.nix
View File

@ -7,7 +7,7 @@
, intel-compute-runtime
, intel-media-driver
, mpv
, vaapiIntel
, intel-vaapi-driver
, vlc
}:
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
passthru.tests = {
# other drivers depending on libva and selected application users.
# Please get a confirmation from the maintainer before adding more applications.
inherit intel-compute-runtime intel-media-driver vaapiIntel mpv vlc;
inherit intel-compute-runtime intel-media-driver intel-vaapi-driver mpv vlc;
};
meta = with lib; {

1
pkgs/top-level/aliases.nix
View File

@ -1712,6 +1712,7 @@ mapAliases ({
v4l_utils = v4l-utils; # Added 2019-08-07
vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26
vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists";
varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26
varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26

4
pkgs/top-level/all-packages.nix
View File

@ -20209,8 +20209,8 @@ with pkgs;
inherit (pkgsi686Linux)
amdvlk
intel-media-driver
intel-vaapi-driver
mesa
vaapiIntel
libvdpau-va-gl
vaapiVdpau
beignet
@ -24464,7 +24464,7 @@ with pkgs;
v8 = darwin.apple_sdk_11_0.callPackage ../development/libraries/v8 { };
vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { };
vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { };