From 4180befaaf1ebfccae53fccfbaf1ba779fd849fe Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2023 10:40:35 -0500 Subject: [PATCH] gstreamer: Add `meta.pkgConfigModules` and test --- .../libraries/gstreamer/base/default.nix | 17 ++++++++++++++--- .../libraries/gstreamer/core/default.nix | 16 ++++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 395708c2a680..e03f9f0b844f 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -37,15 +37,18 @@ , enableCdparanoia ? (!stdenv.isDarwin) , cdparanoia , glib +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; version = "1.20.3"; outputs = [ "out" "dev" ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-fjCz3YGnA4D/dVT5mEcdaZb/drvm/FRHCW+FHiRHPJ8="; }; @@ -146,11 +149,19 @@ stdenv.mkDerivation rec { waylandEnabled = enableWayland; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Base GStreamer plug-ins and helper libraries"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; + pkgConfigModules = [ + "gstreamer-audio-1.0" + "gstreamer-base-1.0" + "gstreamer-net-1.0" + "gstreamer-video-1.0" + ]; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; }; -} +}) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 41acd079583e..80fc921a3679 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -17,9 +17,10 @@ , lib , CoreServices , gobject-introspection +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; version = "1.20.3"; @@ -32,7 +33,9 @@ stdenv.mkDerivation rec { # - https://github.com/NixOS/nixpkgs/issues/98769#issuecomment-702296551 ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-YH2vZLu9X7GK+dF+IcDSLE1wL//oOyPLItGxryyiOio="; }; @@ -108,11 +111,16 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with lib ;{ + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { description = "Open source multimedia framework"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; + pkgConfigModules = [ + "gstreamer-controller-1.0" + ]; platforms = platforms.unix; maintainers = with maintainers; [ ttuegel matthewbauer ]; }; -} +})