Merge pull request #216474 from sternenseemann/curl-pkg-config-meta

curl: add pkg-config metadata for libcurl.pc

authored by

John Ericson and committed by
GitHub
3f3282a9 824cf452

+9 -1
+1 -1
doc/languages-frameworks/pkg-config.section.md
··· 6 6 7 7 ## Writing packages providing pkg-config modules 8 8 9 - Packages should set `meta.pkgConfigProvides` with the list of package config modules they provide. 9 + Packages should set `meta.pkgConfigModules` with the list of package config modules they provide. 10 10 They should also use `testers.testMetaPkgConfig` to check that the final built package matches that list. 11 11 Additionally, the [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), will do extra checks on to-be-installed pkg-config modules. 12 12
+3
pkgs/tools/networking/curl/default.nix
··· 33 33 , phpExtensions 34 34 , python3 35 35 , tests 36 + , testers 36 37 , fetchpatch 37 38 }: 38 39 ··· 178 179 # Additional checking with support http3 protocol. 179 180 # nginx-http3 = useThisCurl nixosTests.nginx-http3; 180 181 nginx-http3 = nixosTests.nginx-http3; 182 + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 181 183 }; 182 184 }; 183 185 ··· 189 191 platforms = platforms.all; 190 192 # Fails to link against static brotli or gss 191 193 broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); 194 + pkgConfigModules = [ "libcurl" ]; 192 195 }; 193 196 })
+5
pkgs/top-level/pkg-config/pkg-config-data.json
··· 445 445 "openssl" 446 446 ] 447 447 }, 448 + "libcurl": { 449 + "attrPath": [ 450 + "curl" 451 + ] 452 + }, 448 453 "libecpg": { 449 454 "attrPath": [ 450 455 "postgresql"