From fc5a8f129f4c8e3bb2a4560cab86ccf71e134084 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 8 Aug 2023 11:51:00 +0200 Subject: [PATCH 1/5] libthai: add meta.pkgConfigModules annotation --- pkgs/development/libraries/libthai/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix index eceaf8c08f53..a88b427e3349 100644 --- a/pkgs/development/libraries/libthai/default.nix +++ b/pkgs/development/libraries/libthai/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ ]; + pkgConfigModules = [ "libthai" ]; }; } From addc9bcd3e7349596026d05bfb2023c50931d7ab Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 8 Aug 2023 11:51:18 +0200 Subject: [PATCH 2/5] pango: add meta.pkgConfigModules annotation --- pkgs/development/libraries/pango/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index a92f5f6d1650..e2155043aa3f 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -119,5 +119,14 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; platforms = platforms.unix; + + pkgConfigModules = [ + "pango" + "pangocairo" + "pangofc" + "pangoft2" + "pangoot" + "pangoxft" + ]; }; } From e7d708bd7380b5ee039db4c1f735159edf1d9169 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 8 Aug 2023 11:51:34 +0200 Subject: [PATCH 3/5] pcre: add meta.pkgConfigModules annotation --- pkgs/development/libraries/pcre/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 8bc1055279fa..52219152845b 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -57,5 +57,9 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ ]; + pkgConfigModules = [ + "libpcre" + "libpcreposix" + ]; }; } From f8c558ca8031505aa9b6bf722639f31c81cbe203 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 8 Aug 2023 11:51:46 +0200 Subject: [PATCH 4/5] libsepol: add meta.pkgConfigModules annotation --- pkgs/os-specific/linux/libsepol/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index abe797f74b25..5d1c1cfc89c0 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ ]; license = lib.licenses.gpl2Plus; + pkgConfigModules = [ "libselinux" ]; }; } From c995eb0c5e205755f96c1f5124147d5202cd6f86 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 8 Aug 2023 11:52:07 +0200 Subject: [PATCH 5/5] util-linux: add meta.pkgConfigModules annotation --- pkgs/os-specific/linux/util-linux/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 9a335010c872..e69ec1fb324d 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -138,6 +138,13 @@ stdenv.mkDerivation rec { # https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/README.licensing license = with licenses; [ gpl2Only gpl2Plus gpl3Plus lgpl21Plus bsd3 bsdOriginalUC publicDomain ]; platforms = platforms.unix; + pkgConfigModules = [ + "blkid" + "fdisk" + "mount" + "smartcols" + "uuid" + ]; priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages }; }