From 1d551bd1fceeced6c2fb73ed55b95398dec7b604 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 8 Aug 2023 14:52:39 +0200 Subject: [PATCH 01/10] libdatrie: add meta.pkgConfigModules annotation --- pkgs/development/libraries/libdatrie/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index 8ea080ef10af..765efe573a64 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ ]; + pkgConfigModules = [ "datrie-0.2" ]; }; } From 583141c525f29716b9cc0dcd9f1ed0b3f38dbe64 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 8 Aug 2023 14:53:23 +0200 Subject: [PATCH 02/10] libepoxy: add meta.pkgConfigModules annotation --- pkgs/development/libraries/libepoxy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 1636d6cd6c65..6c7b55914296 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -72,5 +72,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; + pkgConfigModules = [ "epoxy" ]; }; } From 9acbe31a1f1578b8959a3bd945f6d1a4ea48f011 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 8 Aug 2023 14:53:55 +0200 Subject: [PATCH 03/10] libpsl: add meta.pkgConfigModules annotation --- pkgs/development/libraries/libpsl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 10a12dbfa771..2af41e7785ae 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -92,5 +92,6 @@ in stdenv.mkDerivation rec { maintainers = [ maintainers.c0bw3b ]; mainProgram = "psl"; platforms = platforms.unix; + pkgConfigModules = [ "libpsl" ]; }; } From cacb118b7835e318df14bff489ef3ecb73ee614c Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 8 Aug 2023 14:54:33 +0200 Subject: [PATCH 04/10] libsoup: add meta.pkgConfigModules annotation --- pkgs/development/libraries/libsoup/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index df9ce5c5b6e1..eb99010fb85d 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -99,5 +99,9 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/libsoup"; license = lib.licenses.lgpl2Plus; inherit (glib.meta) maintainers platforms; + pkgConfigModules = [ + "libsoup-2.4" + "libsoup-gnome-2.4" + ]; }; } From 94a6ca907fcf96368e221bfe1737c8337d538fc2 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 8 Aug 2023 14:55:28 +0200 Subject: [PATCH 05/10] libxkbcommon: add meta.pkgConfigModules annotation --- pkgs/development/libraries/libxkbcommon/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index ed936a9d0377..b4683f673fba 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -63,5 +63,10 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ primeos ttuegel ]; mainProgram = "xkbcli"; platforms = with platforms; unix; + pkgConfigModules = [ + "xkbcommon" + "xkbcommon-x11" + "xkbregistry" + ]; }; } From 2d87e9ae038e75167d77d50c3a91b5bac076e9fd Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 8 Aug 2023 14:55:55 +0200 Subject: [PATCH 06/10] sqlite: add meta.pkgConfigModules annotation --- pkgs/development/libraries/sqlite/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index a3006e1236a6..cc26df385a5c 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -101,5 +101,6 @@ stdenv.mkDerivation rec { mainProgram = "sqlite3"; maintainers = with maintainers; [ eelco np ]; platforms = platforms.unix ++ platforms.windows; + pkgConfigModules = [ "sqlite3" ]; }; } From ae7cc3b3147166284c44b31d80c7c418a93685b2 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 8 Aug 2023 14:56:27 +0200 Subject: [PATCH 07/10] libsysprof-capture: add meta.pkgConfigModules annotation --- pkgs/development/tools/profiling/sysprof/capture.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix index 4057db6b74f3..ec5d1a670d03 100644 --- a/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/pkgs/development/tools/profiling/sysprof/capture.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { description = "Static library for Sysprof capture data generation"; license = lib.licenses.bsd2Patent; platforms = lib.platforms.all; + pkgConfigModules = [ "sysprof-capture-4" ]; }; } From d85a512a388caceae1f65b7ed181501ce54b6b5c Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 8 Aug 2023 14:57:10 +0200 Subject: [PATCH 08/10] xorg.libxcb: add meta.pkgConfigModules annotation --- pkgs/servers/x11/xorg/overrides.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index aebfc73c5c11..50f3c297e858 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -83,6 +83,34 @@ self: super: configureFlags = [ "--enable-xkb" "--enable-xinput" ] ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; outputs = [ "out" "dev" "man" "doc" ]; + meta = attrs.meta // { + pkgConfigModules = [ + "xcb-composite" + "xcb-damage" + "xcb-dpms" + "xcb-dri2" + "xcb-dri3" + "xcb-glx" + "xcb-present" + "xcb-randr" + "xcb-record" + "xcb-render" + "xcb-res" + "xcb-screensaver" + "xcb-shape" + "xcb-shm" + "xcb-sync" + "xcb-xf86dri" + "xcb-xfixes" + "xcb-xinerama" + "xcb-xinput" + "xcb-xkb" + "xcb-xtest" + "xcb-xv" + "xcb-xvmc" + "xcb" + ]; + }; }); libX11 = super.libX11.overrideAttrs (attrs: { From 09b6e7fb21c8f901f1c55a7b0422db3679efaa95 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 8 Aug 2023 14:57:36 +0200 Subject: [PATCH 09/10] xorg.libXdmcp: add meta.pkgConfigModules annotation --- pkgs/servers/x11/xorg/overrides.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 50f3c297e858..fe00b2feb591 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -147,6 +147,9 @@ self: super: libXdmcp = super.libXdmcp.overrideAttrs (attrs: { outputs = [ "out" "dev" "doc" ]; + meta = attrs.meta // { + pkgConfigModules = [ "xdmcp" ]; + }; }); libXfont = super.libXfont.overrideAttrs (attrs: { From de7882fd41915b243a3430905189b2ee5f4c42d8 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 8 Aug 2023 14:57:56 +0200 Subject: [PATCH 10/10] xorg.libXtst: add meta.pkgConfigModules annotation --- pkgs/servers/x11/xorg/overrides.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index fe00b2feb591..edfa0e879450 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -152,6 +152,12 @@ self: super: }; }); + libXtst = super.libXtst.overrideAttrs (attrs: { + meta = attrs.meta // { + pkgConfigModules = [ "xtst" ]; + }; + }); + libXfont = super.libXfont.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ freetype ]; # propagate link reqs. like bzip2