diff options
author | Emily Trau <13267947+emilytrau@users.noreply.github.com> | 2023-12-01 22:54:17 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-01 22:54:17 +1100 |
commit | 3ca25cf8852f17a0d76aebdf7a507ffc8d573969 (patch) | |
tree | b07ad9274d30b268b83ff06b9556390c5b9cbac1 | |
parent | 88a955c50f291157329b8ba341ab567c266b158b (diff) | |
parent | 0eb0100afb9458579f780fbff8f11af4f6674f4c (diff) | |
download | nixlib-3ca25cf8852f17a0d76aebdf7a507ffc8d573969.tar nixlib-3ca25cf8852f17a0d76aebdf7a507ffc8d573969.tar.gz nixlib-3ca25cf8852f17a0d76aebdf7a507ffc8d573969.tar.bz2 nixlib-3ca25cf8852f17a0d76aebdf7a507ffc8d573969.tar.lz nixlib-3ca25cf8852f17a0d76aebdf7a507ffc8d573969.tar.xz nixlib-3ca25cf8852f17a0d76aebdf7a507ffc8d573969.tar.zst nixlib-3ca25cf8852f17a0d76aebdf7a507ffc8d573969.zip |
Merge pull request #271250 from Kiskae/libva-pkg-check
libva: add test for pkg-config definitions
-rw-r--r-- | pkgs/development/libraries/libva/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 43fe69af2b0e..f3d58613b25d 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -9,16 +9,17 @@ , mpv , intel-vaapi-driver , vlc +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libva" + lib.optionalString minimal "-minimal"; version = "2.20.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ENAsytjqvS8xHZyZLPih3bzBgQ1f/j+s3dWZs1GTWHs="; }; @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { # 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 intel-vaapi-driver mpv vlc; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { @@ -52,9 +54,12 @@ stdenv.mkDerivation rec { driver-specific acceleration backends for each supported hardware vendor. ''; homepage = "https://01.org/linuxmedia/vaapi"; - changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS"; + changelog = "https://raw.githubusercontent.com/intel/libva/${finalAttrs.version}/NEWS"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + pkgConfigModules = [ "libva" "libva-drm" ] ++ lib.optionals (!minimal) [ + "libva-glx" "libva-wayland" "libva-x11" + ]; platforms = platforms.unix; }; -} +}) |