Merge pull request #317542 from SuperSandro2000/vaapiVdpau

This commit is contained in:
Sandro
2024-06-24 11:24:59 +02:00
committed by GitHub
3 changed files with 3 additions and 2 deletions
+1
View File
@@ -1391,6 +1391,7 @@ mapAliases ({
v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10
vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26
vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05
vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
ventoy-bin = ventoy; # Added 2023-04-12
+2 -2
View File
@@ -20423,8 +20423,8 @@ with pkgs;
intel-media-driver
intel-vaapi-driver
mesa
libva-vdpau-driver
libvdpau-va-gl
vaapiVdpau
glxinfo
vdpauinfo;
};
@@ -24613,7 +24613,7 @@ with pkgs;
vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { };
vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { };
libva-vdpau-driver = callPackage ../development/libraries/libva-vdpau-driver { };
vale = callPackage ../tools/text/vale { };