Merge branch master into haskell-updates

Conflicts from #341407 resolved.

1 files changed, 9 insertions, 9 deletions

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 7cef004a8745..8710dd6d977d 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -253,7 +253,7 @@ in {
 
     datadog_trace = callPackage ../development/php-packages/datadog_trace {
       buildPecl = buildPecl.override {
-        stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
+        stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
       };
       inherit (pkgs) darwin;
     };
@@ -463,7 +463,7 @@ in {
           name = "iconv";
           buildInputs = [ libiconv ];
           configureFlags = [ "--with-iconv" ];
-          doCheck = stdenv.isLinux;
+          doCheck = stdenv.hostPlatform.isLinux;
         }
         {
           name = "imap";
@@ -484,7 +484,7 @@ in {
             "LDAP_DIR=${openldap.dev}"
             "LDAP_INCDIR=${openldap.dev}/include"
             "LDAP_LIBDIR=${openldap.out}/lib"
-          ] ++ lib.optionals stdenv.isLinux [
+          ] ++ lib.optionals stdenv.hostPlatform.isLinux [
             "--with-ldap-sasl=${cyrus_sasl.dev}"
           ];
           doCheck = false;
@@ -528,11 +528,11 @@ in {
           name = "opcache";
           buildInputs = [ pcre2 ] ++
             lib.optional
-              (!stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind)
+              (!stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind)
               valgrind.dev;
           configureFlags = lib.optional php.ztsSupport "--disable-opcache-jit";
           zendExtension = true;
-          postPatch = lib.optionalString stdenv.isDarwin ''
+          postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
             # Tests are flaky on darwin
             rm ext/opcache/tests/blacklist.phpt
             rm ext/opcache/tests/bug66338.phpt
@@ -567,7 +567,7 @@ in {
           internalDeps = [ php.extensions.pdo ];
           configureFlags = [ "--with-pdo-dblib=${freetds}" ];
           # Doesn't seem to work on darwin.
-          enable = (!stdenv.isDarwin);
+          enable = (!stdenv.hostPlatform.isDarwin);
           doCheck = false;
         }
         {
@@ -671,7 +671,7 @@ in {
           buildInputs = [ net-snmp openssl ];
           configureFlags = [ "--with-snmp" ];
           # net-snmp doesn't build on darwin.
-          enable = (!stdenv.isDarwin);
+          enable = (!stdenv.hostPlatform.isDarwin);
           doCheck = false;
         }
         {
@@ -680,7 +680,7 @@ in {
           configureFlags = [
             "--enable-soap"
           ];
-          doCheck = stdenv.isDarwin;  # TODO: a couple tests still fail on *-linux
+          doCheck = stdenv.hostPlatform.isDarwin;  # TODO: a couple tests still fail on *-linux
           internalDeps = [ php.extensions.session ];
           patches = lib.optionals (lib.versions.majorMinor php.version == "8.1") [
             # Fix tests with libxml2 2.12
@@ -731,7 +731,7 @@ in {
           # The `sqlite3_bind_bug68849.phpt` test is currently broken for i686 Linux systems since sqlite 3.43, cf.:
           # - https://github.com/php/php-src/issues/12076
           # - https://www.sqlite.org/forum/forumpost/abbb95376ec6cd5f
-          patches = lib.optionals (stdenv.isi686 && stdenv.isLinux) [
+          patches = lib.optionals (stdenv.hostPlatform.isi686 && stdenv.hostPlatform.isLinux) [
             ../development/interpreters/php/skip-sqlite3_bind_bug68849.phpt.patch
           ];
         }