c-ares: add cmake to default, c-aresMinimal: init

This commit is contained in:
Jonathan Ringer 2022-09-13 17:51:32 -07:00
parent ef6a273c70
commit e0d8990938
No known key found for this signature in database
GPG key ID: 5C841D3CFDFEC4E0
4 changed files with 26 additions and 6 deletions

View file

@ -1,4 +1,7 @@
{ lib, stdenv, fetchurl, writeTextDir }:
{ lib, stdenv, fetchurl, writeTextDir
, fetchpatch
, withCMake ? true, cmake
}:
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
@ -15,6 +18,17 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Gn1SqKhKn7/7G+kTPA9uFyF9kepab6Yfa0cpzaeOu88=";
};
# c-ares is used for fetchpatch, so avoid using it for c-aresMinimal
patches = lib.optionals withCMake [
# fix .pc paths created by cmake build
(fetchpatch {
url = "https://github.com/jonringer/c-ares/commit/9806a8a2f999a8a3efa3c893f2854dce6919d5bb.patch";
sha256 = "sha256-nh/ZKdan2/FTrouApRQA7O8KGZrLEUuWhxGOktiiGwU=";
})
];
nativeBuildInputs = lib.optionals withCMake [ cmake ];
enableParallelBuilding = true;
meta = with lib; {

View file

@ -6,7 +6,7 @@
# Optional dependencies
, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic
, c-ares, libev, openssl, zlib
, c-aresMinimal, libev, openssl, zlib
, enableAsioLib ? false, boost
, enableGetAssets ? false, libxml2
, enableHpack ? false, jansson
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
++ lib.optionals (enableApp) [ installShellFiles ]
++ lib.optionals (enablePython) [ python3Packages.cython ];
buildInputs = lib.optionals enableApp [ c-ares libev openssl zlib ]
buildInputs = lib.optionals enableApp [ c-aresMinimal libev openssl zlib ]
++ lib.optionals (enableAsioLib) [ boost ]
++ lib.optionals (enableGetAssets) [ libxml2 ]
++ lib.optionals (enableHpack) [ jansson ]

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, perl, nixosTests
, brotliSupport ? false, brotli
, c-aresSupport ? false, c-ares
, c-aresSupport ? false, c-aresMinimal
, gnutlsSupport ? false, gnutls
, gsaslSupport ? false, gsasl
, gssSupport ? with stdenv.hostPlatform; (
@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
# applications that use Curl.
propagatedBuildInputs = with lib;
optional brotliSupport brotli ++
optional c-aresSupport c-ares ++
optional c-aresSupport c-aresMinimal ++
optional gnutlsSupport gnutls ++
optional gsaslSupport gsasl ++
optional gssSupport libkrb5 ++

View file

@ -18032,7 +18032,13 @@ with pkgs;
bzrtp = callPackage ../development/libraries/bzrtp { };
c-ares = callPackage ../development/libraries/c-ares { };
c-ares = callPackage ../development/libraries/c-ares {
inherit (buildPackages) cmake;
};
c-aresMinimal = callPackage ../development/libraries/c-ares {
withCMake = false;
};
c-blosc = callPackage ../development/libraries/c-blosc { };