php.buildPecl: add stdenv argument

NixOS · Jul 9, 2023 · 401a424 · 401a424
1 parent 1a87fd5
commit 401a424
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, php, autoreconfHook, fetchurl, re2c, nix-update-script }:
+{ stdenv, lib, php, autoreconfHook, fetchurl, re2c, nix-update-script }@imports:
 
 { pname
 , version
@@ -13,6 +13,7 @@
     inherit (args) sha256;
   }
 , passthru ? { }
+, stdenv ? imports.stdenv
 , ...
 }@args:
 

diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix
@@ -1,18 +1,19 @@
 { lib
-, php
 , stdenv
+, php
 , cargo
 , rustc
 , fetchFromGitHub
 , rustPlatform
 , curl
 , pcre2
 , libiconv
-, CoreFoundation
-, Security
-}:
+, darwin
+}@attrs:
 
 php.buildPecl rec {
+  stdenv = if attrs.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else attrs.stdenv;
+
   pname = "datadog_trace";
   version = "0.89.0";
 
@@ -41,8 +42,8 @@ php.buildPecl rec {
   ];
 
   buildInputs = [ curl pcre2 libiconv ] ++ lib.optionals stdenv.isDarwin [
-    CoreFoundation
-    Security
+    darwin.apple_sdk_11_0.frameworks.CoreFoundation
+    darwin.apple_sdk_11_0.frameworks.Security
   ];
 
   meta = {