From 41d426db5b9b0e9f4157fbf433ecc0ec16ebf0aa Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sun, 6 Sep 2026 19:10:58 +0200 Subject: [PATCH 1/2] protobuf: use separate outputs --- pkgs/development/libraries/protobuf/generic.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 45db4049d10a..08c2ac50cad5 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -37,6 +37,12 @@ stdenv.mkDerivation (finalAttrs: { inherit hash; }; + outputs = [ + "out" + "lib" + "dev" + ]; + patches = lib.optionals (lib.versionOlder version "22") [ # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute From dc3cf5062f4c8449a7921a380fa87d7cde3ac8d8 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sun, 6 Sep 2026 19:11:31 +0200 Subject: [PATCH 2/2] protobuf: add `meta.pkgConfigModules` --- pkgs/development/libraries/protobuf/generic.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 08c2ac50cad5..958ef2b7d19d 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -186,6 +186,10 @@ stdenv.mkDerivation (finalAttrs: { inherit (python3.pkgs) celery; version = testers.testVersion { package = protobuf; }; + + pkg-config = testers.hasPkgConfigModules { + package = protobuf; + }; }; inherit abseil-cpp; @@ -203,5 +207,15 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://protobuf.dev/"; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "protoc"; + pkgConfigModules = [ + "protobuf" + "protobuf_lite" + ] + ++ lib.optionals (lib.versionAtLeast version "22") [ + "utf8_range" + ] + ++ lib.optionals (lib.versionAtLeast version "27") [ + "upb" + ]; }; })