mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-23 05:14:45 +00:00
curl: build with system frameworks
Unblocks staging-next and restores NAT64 support on Darwin. Closes #260599
This commit is contained in:
parent
df14e86d9c
commit
84cf8e007f
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, perl, nixosTests
|
||||
{ lib, stdenv, fetchurl, darwin, pkg-config, perl, nixosTests
|
||||
, brotliSupport ? false, brotli
|
||||
, c-aresSupport ? false, c-aresMinimal
|
||||
, gnutlsSupport ? false, gnutls
|
||||
@ -57,10 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-FsYqnErw9wPSi9pte783ukcFWtNBTXDexj4uYzbyqC0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./7.79.1-darwin-no-systemconfiguration.patch
|
||||
];
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
|
||||
separateDebugInfo = stdenv.isLinux;
|
||||
|
||||
@ -68,6 +64,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
CoreFoundation
|
||||
CoreServices
|
||||
SystemConfiguration
|
||||
]);
|
||||
nativeBuildInputs = [ pkg-config perl ];
|
||||
|
||||
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
|
||||
|
Loading…
Reference in New Issue
Block a user