Merge pull request #242655 from NixOS/php/extensions/mongodb-followup-fix-buildPecl

phpExtensions: prevent `buildPecl` to always use the same version of PHP

pkgs/development/php-packages/datadog_trace/default.nix

@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, php
+, buildPecl
 , cargo
 , rustc
 , fetchFromGitHub
@@ -8,12 +8,10 @@
 , curl
 , pcre2
 , libiconv
-, CoreFoundation
-, Security
-, Libsystem
+, darwin
 }:
 
-php.buildPecl rec {
+buildPecl rec {
   pname = "datadog_trace";
   version = "0.89.0";
 
@@ -37,14 +35,14 @@ php.buildPecl rec {
   nativeBuildInputs = [
     cargo
     rustc
-    rustPlatform.bindgenHook
-    rustPlatform.cargoSetupHook
+    darwin.apple_sdk_11_0.rustPlatform.bindgenHook
+    darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook
   ];
 
   buildInputs = [ curl pcre2 ] ++ lib.optionals stdenv.isDarwin [
-    CoreFoundation
-    Security
-    Libsystem
+    darwin.apple_sdk_11_0.frameworks.CoreFoundation
+    darwin.apple_sdk_11_0.frameworks.Security
+    darwin.apple_sdk_11_0.Libsystem
     libiconv
   ];
 
@@ -52,7 +50,7 @@ php.buildPecl rec {
     changelog = "https://github.com/DataDog/dd-trace-php/blob/${src.rev}/CHANGELOG.md";
     description = "Datadog Tracing PHP Client";
     homepage = "https://github.com/DataDog/dd-trace-php";
-    license = with lib.licenses; [ asl20 /* or */ bsd3 ];
+    license = with lib.licenses; [ asl20 bsd3 ];
     maintainers = lib.teams.php.members;
   };
 }

pkgs/development/php-packages/mongodb/default.nix

@@ -1,5 +1,5 @@
 { stdenv
-, php
+, buildPecl
 , fetchFromGitHub
 , lib
 , libiconv
@@ -10,11 +10,10 @@
 , openssl
 , snappy
 , zlib
-, Security
-, Libsystem
+, darwin
 }:
 
-php.buildPecl rec {
+buildPecl rec {
   pname = "mongodb";
   version = "1.16.1";
 
@@ -35,8 +34,8 @@ php.buildPecl rec {
     zlib
     pcre2
   ] ++ lib.optionals stdenv.isDarwin [
-    Security
-    Libsystem
+    darwin.apple_sdk_11_0.frameworks.Security
+    darwin.apple_sdk_11_0.Libsystem
     libiconv
   ];
 

pkgs/top-level/php-packages.nix

@@ -222,9 +222,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
     couchbase = callPackage ../development/php-packages/couchbase { };
 
-    datadog_trace = pkgs.darwin.apple_sdk_11_0.callPackage ../development/php-packages/datadog_trace {
-      inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security CoreFoundation;
-      inherit (pkgs.darwin.apple_sdk_11_0) Libsystem;
+    datadog_trace = callPackage ../development/php-packages/datadog_trace {
+      inherit (pkgs) darwin;
     };
 
     ds = callPackage ../development/php-packages/ds { };
@@ -247,9 +246,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
     memcached = callPackage ../development/php-packages/memcached { };
 
-    mongodb = pkgs.darwin.apple_sdk_11_0.callPackage ../development/php-packages/mongodb {
-      inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security;
-      inherit (pkgs.darwin.apple_sdk_11_0) Libsystem;
+    mongodb = callPackage ../development/php-packages/mongodb {
+      inherit (pkgs) darwin;
     };
 
     msgpack = callPackage ../development/php-packages/msgpack { };