diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-06-24 11:24:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-24 11:24:59 +0200 |
| commit | 4dd848e018b85550e7b5de57db46f06ee0884c3b (patch) | |
| tree | ae9004074c876025577e522aa07e23404c66753c | |
| parent | 9b075e9a9b4fa1cf1f5f21851565a166935d9197 (diff) | |
| parent | 5783082382a7ccf62d276b67084803b3b2dcda58 (diff) | |
Merge pull request #317542 from SuperSandro2000/vaapiVdpau
| -rw-r--r-- | pkgs/development/libraries/libva-vdpau-driver/default.nix (renamed from pkgs/development/libraries/vaapi-vdpau/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/libva-vdpau-driver/default.nix index 2e3976e3a4d23..2e3976e3a4d23 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/libva-vdpau-driver/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index db1973e884284..1755693169c25 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d913476af0d9..c9bf07a0b566a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |