treewide: Add meta.pkgConfigModules to a few packages

Picking up where https://github.com/NixOS/nixpkgs/pull/214304 left off.
This commit is contained in:
John Ericson 2023-02-06 23:16:20 -05:00
parent a2faa3cc5e
commit f0636c6055
6 changed files with 43 additions and 18 deletions

View file

@ -21,6 +21,7 @@
, libde265Support ? true, libde265 , libde265Support ? true, libde265
, fftw , fftw
, ApplicationServices, Foundation , ApplicationServices, Foundation
, testers
}: }:
let let
@ -33,14 +34,14 @@ let
else null; else null;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick"; pname = "imagemagick";
version = "6.9.12-68"; version = "6.9.12-68";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ImageMagick"; owner = "ImageMagick";
repo = "ImageMagick6"; repo = "ImageMagick6";
rev = version; rev = finalAttrs.version;
sha256 = "sha256-slQcA0cblxtG/1DiJx5swUh7Kfwgz5HG70eqJFLaQJI="; sha256 = "sha256-slQcA0cblxtG/1DiJx5swUh7Kfwgz5HG70eqJFLaQJI=";
}; };
@ -109,10 +110,13 @@ stdenv.mkDerivation rec {
done done
''; '';
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = with lib; { meta = with lib; {
homepage = "https://legacy.imagemagick.org/"; homepage = "https://legacy.imagemagick.org/";
changelog = "https://legacy.imagemagick.org/script/changelog.php"; changelog = "https://legacy.imagemagick.org/script/changelog.php";
description = "A software suite to create, edit, compose, or convert bitmap images"; description = "A software suite to create, edit, compose, or convert bitmap images";
pkgConfigModules = [ "ImageMagick" "MagickWand" ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
license = licenses.asl20; license = licenses.asl20;
@ -137,4 +141,4 @@ stdenv.mkDerivation rec {
"CVE-2022-2719" "CVE-2022-2719"
]; ];
}; };
} })

View file

@ -45,14 +45,14 @@ let
else null; else null;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick"; pname = "imagemagick";
version = "7.1.0-61"; version = "7.1.0-61";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ImageMagick"; owner = "ImageMagick";
repo = "ImageMagick"; repo = "ImageMagick";
rev = version; rev = finalAttrs.version;
hash = "sha256-g7WeqPpPd1gceU+s+vRDpb41IX1lzpiqh3cAYeFdUlg="; hash = "sha256-g7WeqPpPd1gceU+s+vRDpb41IX1lzpiqh3cAYeFdUlg=";
}; };
@ -126,14 +126,16 @@ stdenv.mkDerivation rec {
passthru.tests = { passthru.tests = {
version = testers.testVersion { package = imagemagick; }; version = testers.testVersion { package = imagemagick; };
inherit (python3.pkgs) img2pdf; inherit (python3.pkgs) img2pdf;
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
}; };
meta = with lib; { meta = with lib; {
homepage = "http://www.imagemagick.org/"; homepage = "http://www.imagemagick.org/";
description = "A software suite to create, edit, compose, or convert bitmap images"; description = "A software suite to create, edit, compose, or convert bitmap images";
pkgConfigModules = [ "ImageMagick" "MagickWand" ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ erictapen dotlambda ]; maintainers = with maintainers; [ erictapen dotlambda ];
license = licenses.asl20; license = licenses.asl20;
mainProgram = "magick"; mainProgram = "magick";
}; };
} })

View file

@ -5,7 +5,8 @@
, python ? null , python ? null
, ncurses, swig2 , ncurses, swig2
, extraPackages ? [] , extraPackages ? []
} : , testers
}:
let let
@ -14,7 +15,7 @@ let
modulesPath = "lib/SoapySDR/modules" + modulesVersion; modulesPath = "lib/SoapySDR/modules" + modulesVersion;
extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages;
in stdenv.mkDerivation { in stdenv.mkDerivation (finalAttrs: {
pname = "soapysdr"; pname = "soapysdr";
inherit version; inherit version;
@ -58,12 +59,15 @@ in stdenv.mkDerivation {
done done
''; '';
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = with lib; { meta = with lib; {
homepage = "https://github.com/pothosware/SoapySDR"; homepage = "https://github.com/pothosware/SoapySDR";
description = "Vendor and platform neutral SDR support library"; description = "Vendor and platform neutral SDR support library";
license = licenses.boost; license = licenses.boost;
maintainers = with maintainers; [ markuskowa ]; maintainers = with maintainers; [ markuskowa ];
mainProgram = "SoapySDRUtil"; mainProgram = "SoapySDRUtil";
pkgConfigModules = [ "SoapySDR" ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} })

View file

@ -8,9 +8,10 @@
, gtk3, libindicator-gtk3, libdbusmenu-gtk3 , gtk3, libindicator-gtk3, libdbusmenu-gtk3
, gtk-doc, vala, gobject-introspection , gtk-doc, vala, gobject-introspection
, monoSupport ? false, mono, gtk-sharp-2_0 , monoSupport ? false, mono, gtk-sharp-2_0
}: , testers
}:
stdenv.mkDerivation { stdenv.mkDerivation (finalAttrs: {
pname = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; pname = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}";
in "libappindicator-${postfix}"; in "libappindicator-${postfix}";
version = "12.10.1+20.10.20200706.1"; version = "12.10.1+20.10.20200706.1";
@ -54,11 +55,17 @@ stdenv.mkDerivation {
"localstatedir=\${TMPDIR}" "localstatedir=\${TMPDIR}"
]; ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = with lib; { meta = with lib; {
description = "A library to allow applications to export a menu into the Unity Menu bar"; description = "A library to allow applications to export a menu into the Unity Menu bar";
homepage = "https://launchpad.net/libappindicator"; homepage = "https://launchpad.net/libappindicator";
license = with licenses; [ lgpl21 lgpl3 ]; license = with licenses; [ lgpl21 lgpl3 ];
pkgConfigModules = {
"2" = [ "appindicator-0.1" ];
"3" = [ "appindicator3-0.1" ];
}.${gtkVersion} or [];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.msteen ]; maintainers = [ maintainers.msteen ];
}; };
} })

View file

@ -13,16 +13,17 @@
, OpenGL , OpenGL
, runtimeShell , runtimeShell
, withXorg ? true , withXorg ? true
, testers
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "libdevil"; pname = "libdevil";
version = "1.7.8"; version = "1.7.8";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/openil/DevIL-${version}.tar.gz"; url = "mirror://sourceforge/openil/DevIL-${finalAttrs.version}.tar.gz";
sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8";
}; };
@ -63,11 +64,14 @@ stdenv.mkDerivation rec {
done done
''; '';
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = with lib; { meta = with lib; {
homepage = "https://openil.sourceforge.net/"; homepage = "https://openil.sourceforge.net/";
description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats";
license = licenses.lgpl2; license = licenses.lgpl2;
pkgConfigModules = [ "IL" ];
platforms = platforms.mesaPlatforms; platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };
} })

View file

@ -3,14 +3,15 @@
, fetchurl , fetchurl
, alsa-topology-conf , alsa-topology-conf
, alsa-ucm-conf , alsa-ucm-conf
, testers
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "alsa-lib"; pname = "alsa-lib";
version = "1.2.7.2"; version = "1.2.7.2";
src = fetchurl { src = fetchurl {
url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; url = "mirror://alsa/lib/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
hash = "sha256-ijW3IY5Q8qLHk0LQ3pje2BQ5zhnhKAk4Xsm+lZbefC8="; hash = "sha256-ijW3IY5Q8qLHk0LQ3pje2BQ5zhnhKAk4Xsm+lZbefC8=";
}; };
@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = with lib; { meta = with lib; {
homepage = "http://www.alsa-project.org/"; homepage = "http://www.alsa-project.org/";
description = "ALSA, the Advanced Linux Sound Architecture libraries"; description = "ALSA, the Advanced Linux Sound Architecture libraries";
@ -41,7 +44,8 @@ stdenv.mkDerivation rec {
''; '';
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
pkgConfigModules = [ "alsa" "alsa-topology" ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ l-as ]; maintainers = with maintainers; [ l-as ];
}; };
} })