From c0a1af53c6984575c4f3698c66c05ebae6059085 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 12 Nov 2022 09:19:16 +0100 Subject: [PATCH 1/2] php80: Enable pcre built with jit sealloc This was an issue back in PHP 7.3 and has been fixed according to the comment made on 2019-10-07: https://bugs.php.net/bug.php?id=78630#1570447943 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bff284bfc225..9ad81bb7c2bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15792,7 +15792,7 @@ with pkgs; php80 = callPackage ../development/interpreters/php/8.0.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; pcre2 = pcre2.override { - withJitSealloc = false; # Needed to avoid crashes, see https://bugs.php.net/bug.php?id=78630 + withJitSealloc = !stdenv.isDarwin; }; }; php80Extensions = recurseIntoAttrs php80.extensions; From 8abee3d9265cd5f86993571fed742fb6e962435d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 12 Nov 2022 09:22:00 +0100 Subject: [PATCH 2/2] php81: Enable pcre built with jit sealloc This was an issue back in PHP 7.3 and has been fixed according to the comment made on 2019-10-07: https://bugs.php.net/bug.php?id=78630#1570447943 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ad81bb7c2bf..08b32c09b8f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15782,7 +15782,7 @@ with pkgs; php81 = callPackage ../development/interpreters/php/8.1.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; pcre2 = pcre2.override { - withJitSealloc = false; # Needed to avoid crashes, see https://bugs.php.net/bug.php?id=78630 + withJitSealloc = !stdenv.isDarwin; }; }; php81Extensions = recurseIntoAttrs php81.extensions;