diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 7c0994d15b6..70052197d22 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -223,8 +223,7 @@ let [ "--disable-all" ] # PCRE - ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] - ++ [ "PCRE_LIBDIR=${pcre2}" ] + ++ [ "--with-external-pcre=${pcre2.dev}" ] # Enable sapis @@ -232,10 +231,6 @@ let ++ lib.optional (!cliSupport) "--disable-cli" ++ lib.optional fpmSupport "--enable-fpm" ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ] - ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ - "--enable-libxml" - "--with-libxml-dir=${libxml2.dev}" - ] ++ lib.optional pharSupport "--enable-phar" ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" @@ -270,14 +265,7 @@ let done export EXTENSION_DIR=$out/lib/php/extensions - '' - # PKG_CONFIG need not be a relative path - + lib.optionalString (lib.versionOlder version "7.4") '' - for i in $(find . -type f -name "*.m4"); do - substituteInPlace $i \ - --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' - done - '' + '' + ./buildconf --copy --force if test -f $src/genfiles; then diff --git a/pkgs/development/interpreters/php/zlib-darwin-tests.patch b/pkgs/development/interpreters/php/zlib-darwin-tests.patch deleted file mode 100644 index ef61f0a8784..00000000000 --- a/pkgs/development/interpreters/php/zlib-darwin-tests.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/ext/zlib/tests/bug55544.phpt b/ext/zlib/tests/bug55544.phpt -index a0d22f4fcebf4846da6781f424f87821626de5ea..e650fe6909f555d04834f4c08f7fd0d354b783e2 100644 ---- a/ext/zlib/tests/bug55544.phpt -+++ b/ext/zlib/tests/bug55544.phpt -@@ -6,6 +6,9 @@ extension_loaded("zlib") or die("skip"); - if (substr(PHP_OS, 0, 3) == 'WIN') { - die("skip not for windows"); - } -+if (PHP_OS == "Darwin") { -+ die("skip not for darwin"); -+} - ?> - --INI-- - output_handler=ob_gzhandler -diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt -index c966b2cbc5b7..2f953168fa22 100644 ---- a/ext/zlib/tests/gzencode_variation1.phpt -+++ b/ext/zlib/tests/gzencode_variation1.phpt -@@ -10,6 +10,10 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) { - if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; - } -+ -+if (PHP_OS == "Darwin") { -+ print "skip - OS is encoded in headers, tested header is non Darwin"; -+} - ?> - --FILE-- - - --FILE-- -