From c2e00b14cd8bdd08087925650f0818204cba1973 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 26 Oct 2023 01:11:24 -0400 Subject: phpExtensions.datadog_trace: switch to overrideSDK Using overrideSDK allows datadog_trace to use the correct SDK frameworks even when they are propagated from curl. --- pkgs/development/php-packages/datadog_trace/default.nix | 5 ++--- pkgs/top-level/php-packages.nix | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index e3761a1abc29c..87e3e06b9428d 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -47,9 +47,8 @@ buildPecl rec { curl pcre2 ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.Libsystem + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security libiconv ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e0ccb6aa9a084..ee3308fb6e758 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -30,6 +30,7 @@ , openldap , openssl_1_1 , openssl +, overrideSDK , pam , pcre2 , postgresql @@ -239,6 +240,9 @@ lib.makeScope pkgs.newScope (self: with self; { couchbase = callPackage ../development/php-packages/couchbase { }; datadog_trace = callPackage ../development/php-packages/datadog_trace { + buildPecl = buildPecl.override { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; inherit (pkgs) darwin; }; -- cgit 1.4.1