From bcb9b2b7230e8b2c7efee8a382e79344b72b6e20 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 10 Jul 2023 16:44:55 +0200 Subject: [PATCH] phpExtensions.mongodb: prevent `buildPecl` to always use the same version of PHP --- pkgs/development/php-packages/mongodb/default.nix | 11 +++++------ pkgs/top-level/php-packages.nix | 5 ++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 46418271dc37..777f77782490 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/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 ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index bd57652775c8..03ab21fe4b28 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -247,9 +247,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 { };