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

jack: Add meta.pkgConfigModules and test

Browse Source
This commit is contained in:
John Ericson 2023-02-12 14:29:24 -05:00
parent dc3278615e
commit c733f0bf8a
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/misc/jackaudio/default.nix
View File

@ -10,6 +10,8 @@
# Extra options # Extra options
, prefix ? "" , prefix ? ""
, testers
}: }:
with lib; with lib;
@ -25,7 +27,7 @@ let
optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib; optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib;
optLibopus = shouldUsePkg libopus; optLibopus = shouldUsePkg libopus;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "${prefix}jack2"; pname = "${prefix}jack2";
version = "1.9.19"; version = "1.9.19";
@ -63,11 +65,14 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH
''); '');
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = { meta = {
description = "JACK audio connection kit, version 2 with jackdbus"; description = "JACK audio connection kit, version 2 with jackdbus";
homepage = "https://jackaudio.org"; homepage = "https://jackaudio.org";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
pkgConfigModules = [ "jack" ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ goibhniu ]; maintainers = with maintainers; [ goibhniu ];
}; };
} })

11
pkgs/misc/jackaudio/jack1.nix
View File

@ -2,6 +2,8 @@
# Optional Dependencies # Optional Dependencies
, alsa-lib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null , alsa-lib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null
, testers
}: }:
let let
@ -13,12 +15,12 @@ let
optLibffado = shouldUsePkg libffado; optLibffado = shouldUsePkg libffado;
optCelt = shouldUsePkg celt; optCelt = shouldUsePkg celt;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "jack1"; pname = "jack1";
version = "0.125.0"; version = "0.125.0";
src = fetchurl { src = fetchurl {
url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${finalAttrs.version}.tar.gz";
sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm";
}; };
@ -30,11 +32,14 @@ stdenv.mkDerivation rec {
buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; buildInputs = [ optAlsaLib optDb optLibffado optCelt ];
propagatedBuildInputs = [ optLibuuid ]; propagatedBuildInputs = [ optLibuuid ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = with lib; { meta = with lib; {
broken = stdenv.isDarwin; broken = stdenv.isDarwin;
description = "JACK audio connection kit"; description = "JACK audio connection kit";
homepage = "https://jackaudio.org"; homepage = "https://jackaudio.org";
license = with licenses; [ gpl2 lgpl21 ]; license = with licenses; [ gpl2 lgpl21 ];
pkgConfigModules = [ "jack" ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} })