nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-02 10:14:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

curl: build with system frameworks

Browse Source 
Unblocks staging-next and restores NAT64 support on Darwin.

Closes #260599
This commit is contained in:
Randy Eckenrode 2023-10-13 08:46:26 -04:00
parent df14e86d9c
commit 84cf8e007f
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/networking/curl/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, perl, nixosTests { lib, stdenv, fetchurl, darwin, pkg-config, perl, nixosTests
, brotliSupport ? false, brotli , brotliSupport ? false, brotli
, c-aresSupport ? false, c-aresMinimal , c-aresSupport ? false, c-aresMinimal
, gnutlsSupport ? false, gnutls , gnutlsSupport ? false, gnutls
@ -57,10 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-FsYqnErw9wPSi9pte783ukcFWtNBTXDexj4uYzbyqC0="; hash = "sha256-FsYqnErw9wPSi9pte783ukcFWtNBTXDexj4uYzbyqC0=";
}; };
patches = [
./7.79.1-darwin-no-systemconfiguration.patch
];
outputs = [ "bin" "dev" "out" "man" "devdoc" ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ];
separateDebugInfo = stdenv.isLinux; separateDebugInfo = stdenv.isLinux;
@ -68,6 +64,11 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true; strictDeps = true;
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreFoundation
CoreServices
SystemConfiguration
]);
nativeBuildInputs = [ pkg-config perl ]; nativeBuildInputs = [ pkg-config perl ];
# Zlib and OpenSSL must be propagated because `libcurl.la' contains # Zlib and OpenSSL must be propagated because `libcurl.la' contains