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

curl: propagate Darwin frameworks

Browse Source 
`libcurl.la` and `curl-config --static-libs` both include the frameworks
curl needs to link, so propgate them in case dependents don’t include
those frameworks in their build inputs. This fixes building Nix and
probably other things (like netcdf).
This commit is contained in:
Randy Eckenrode 2023-10-25 11:49:52 -04:00
parent 4239c39104
commit 028534b7d4
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,11 +64,6 @@ 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
@ -91,7 +86,12 @@ stdenv.mkDerivation (finalAttrs: {
optional wolfsslSupport wolfssl ++
optional rustlsSupport rustls-ffi ++
optional zlibSupport zlib ++
optional zstdSupport zstd;
optional zstdSupport zstd ++
optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreFoundation
CoreServices
SystemConfiguration
]);
# for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html
preConfigure = ''