From f0636c60556efb4c0330ba69a0ecdce4a6f60b93 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 6 Feb 2023 23:16:20 -0500 Subject: [PATCH] treewide: Add `meta.pkgConfigModules` to a few packages Picking up where https://github.com/NixOS/nixpkgs/pull/214304 left off. --- pkgs/applications/graphics/ImageMagick/6.x.nix | 10 +++++++--- pkgs/applications/graphics/ImageMagick/default.nix | 8 +++++--- pkgs/applications/radio/soapysdr/default.nix | 10 +++++++--- .../libraries/libappindicator/default.nix | 13 ++++++++++--- pkgs/development/libraries/libdevil/default.nix | 10 +++++++--- .../linux/alsa-project/alsa-lib/default.nix | 10 +++++++--- 6 files changed, 43 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 1f05f8e9fa6..a433cc6516d 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -21,6 +21,7 @@ , libde265Support ? true, libde265 , fftw , ApplicationServices, Foundation +, testers }: let @@ -33,14 +34,14 @@ let else null; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; version = "6.9.12-68"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-slQcA0cblxtG/1DiJx5swUh7Kfwgz5HG70eqJFLaQJI="; }; @@ -109,10 +110,13 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://legacy.imagemagick.org/"; changelog = "https://legacy.imagemagick.org/script/changelog.php"; description = "A software suite to create, edit, compose, or convert bitmap images"; + pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; license = licenses.asl20; @@ -137,4 +141,4 @@ stdenv.mkDerivation rec { "CVE-2022-2719" ]; }; -} +}) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 5adb53b401c..0ad52261330 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -45,14 +45,14 @@ let else null; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; version = "7.1.0-61"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; - rev = version; + rev = finalAttrs.version; hash = "sha256-g7WeqPpPd1gceU+s+vRDpb41IX1lzpiqh3cAYeFdUlg="; }; @@ -126,14 +126,16 @@ stdenv.mkDerivation rec { passthru.tests = { version = testers.testVersion { package = imagemagick; }; inherit (python3.pkgs) img2pdf; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; + pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ erictapen dotlambda ]; license = licenses.asl20; mainProgram = "magick"; }; -} +}) diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index adf997773ec..59a1e0f59ac 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -5,7 +5,8 @@ , python ? null , ncurses, swig2 , extraPackages ? [] -} : +, testers +}: let @@ -14,7 +15,7 @@ let modulesPath = "lib/SoapySDR/modules" + modulesVersion; extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; -in stdenv.mkDerivation { +in stdenv.mkDerivation (finalAttrs: { pname = "soapysdr"; inherit version; @@ -58,12 +59,15 @@ in stdenv.mkDerivation { done ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://github.com/pothosware/SoapySDR"; description = "Vendor and platform neutral SDR support library"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; mainProgram = "SoapySDRUtil"; + pkgConfigModules = [ "SoapySDR" ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 9df992a5763..d1d882dd4eb 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -8,9 +8,10 @@ , gtk3, libindicator-gtk3, libdbusmenu-gtk3 , gtk-doc, vala, gobject-introspection , 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}"; in "libappindicator-${postfix}"; version = "12.10.1+20.10.20200706.1"; @@ -54,11 +55,17 @@ stdenv.mkDerivation { "localstatedir=\${TMPDIR}" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "A library to allow applications to export a menu into the Unity Menu bar"; homepage = "https://launchpad.net/libappindicator"; license = with licenses; [ lgpl21 lgpl3 ]; + pkgConfigModules = { + "2" = [ "appindicator-0.1" ]; + "3" = [ "appindicator3-0.1" ]; + }.${gtkVersion} or []; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; }; -} +}) diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 35637512e0a..0cba50c3a92 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -13,16 +13,17 @@ , OpenGL , runtimeShell , withXorg ? true +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdevil"; version = "1.7.8"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://sourceforge/openil/DevIL-${version}.tar.gz"; + url = "mirror://sourceforge/openil/DevIL-${finalAttrs.version}.tar.gz"; sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; }; @@ -63,11 +64,14 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { 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"; license = licenses.lgpl2; + pkgConfigModules = [ "IL" ]; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ ]; }; -} +}) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index db8ede6feb8..d8fc4648029 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -3,14 +3,15 @@ , fetchurl , alsa-topology-conf , alsa-ucm-conf +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alsa-lib"; version = "1.2.7.2"; src = fetchurl { - url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; + url = "mirror://alsa/lib/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; hash = "sha256-ijW3IY5Q8qLHk0LQ3pje2BQ5zhnhKAk4Xsm+lZbefC8="; }; @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture libraries"; @@ -41,7 +44,8 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; + pkgConfigModules = [ "alsa" "alsa-topology" ]; platforms = platforms.linux; maintainers = with maintainers; [ l-as ]; }; -} +})