From 7a5c5b109a30aea989f3b88301b09fd8b5feaeba Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 15 Feb 2026 20:17:08 +0100 Subject: [PATCH] curl*: move CXX and CXXCPP into env for structuredAttrs --- pkgs/by-name/cu/curlMinimal/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index f41dec189091..978c494b6eea 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -119,7 +119,11 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) { + env = { + CXX = "${stdenv.cc.targetPrefix}c++"; + CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; + } + // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) { # Not having this causes curl’s `configure` script to fail with static builds on Darwin because # some of curl’s propagated inputs need libiconv. NIX_LDFLAGS = "-liconv"; @@ -209,9 +213,6 @@ stdenv.mkDerivation (finalAttrs: { "--with-ca-path=/etc/ssl/certs" ]; - CXX = "${stdenv.cc.targetPrefix}c++"; - CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; - # takes 14 minutes on a 24 core and because many other packages depend on curl # they cannot be run concurrently and are a bottleneck # tests are available in passthru.tests.withCheck