From c6fd18ff5e6b9c7686c749faac26094703790223 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 18 Oct 2024 08:41:54 -0500 Subject: [PATCH] curl: Remove forcing static build on Windows There does not appear to be any justification for forcing curl to build its static form on Windows without the shared form. Reverting changes made in commit 1660098d8425a190d42d5604afb54354625392b8 --- pkgs/tools/networking/curl/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index e00aecd50a22..bf01bc98852f 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -149,10 +149,7 @@ stdenv.mkDerivation (finalAttrs: { # For the 'urandom', maybe it should be a cross-system option ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-random=/dev/urandom" - ++ lib.optionals stdenv.hostPlatform.isWindows [ - "--disable-shared" - "--enable-static" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback to nss-cacert from the default profile. # Without this curl might detect /etc/ssl/cert.pem at build time on macOS, causing curl to ignore NIX_SSL_CERT_FILE. "--without-ca-bundle"