diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/php-packages.nix')
| -rw-r--r-- | nixpkgs/pkgs/top-level/php-packages.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/top-level/php-packages.nix b/nixpkgs/pkgs/top-level/php-packages.nix index 25a1c821ac52..0cb66e414839 100644 --- a/nixpkgs/pkgs/top-level/php-packages.nix +++ b/nixpkgs/pkgs/top-level/php-packages.nix @@ -259,6 +259,8 @@ lib.makeScope pkgs.newScope (self: with self; { inotify = callPackage ../development/php-packages/inotify { }; + ioncube-loader = callPackage ../development/php-packages/ioncube-loader { }; + mailparse = callPackage ../development/php-packages/mailparse { }; maxminddb = callPackage ../development/php-packages/maxminddb { }; @@ -372,7 +374,7 @@ lib.makeScope pkgs.newScope (self: with self; { "--enable-dom" ]; # Add a PHP lower version bound constraint to avoid applying the patch on older PHP versions. - patches = lib.optionals (lib.versionOlder php.version "8.2.14" && lib.versionAtLeast php.version "8.1") [ + patches = lib.optionals ((lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.14" && lib.versionAtLeast php.version "8.2.7") || (lib.versions.majorMinor php.version == "8.1" && lib.versionAtLeast php.version "8.1.27")) [ # Fix tests with libxml 2.12 # Part of 8.3.1RC1+, 8.2.14RC1+ (fetchpatch { @@ -411,7 +413,7 @@ lib.makeScope pkgs.newScope (self: with self; { { name = "gettext"; buildInputs = [ gettext ]; - postPhpize = ''substituteInPlace configure --replace 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' ''; + postPhpize = ''substituteInPlace configure --replace-fail 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' ''; configureFlags = [ "--with-gettext=${gettext}" ]; } { @@ -663,7 +665,9 @@ lib.makeScope pkgs.newScope (self: with self; { { name = "xsl"; buildInputs = [ libxslt libxml2 ]; + internalDeps = [ php.extensions.dom ]; doCheck = false; + env.NIX_CFLAGS_COMPILE = toString [ "-I../.." "-DHAVE_DOM" ]; configureFlags = [ "--with-xsl=${libxslt.dev}" ]; } { name = "zend_test"; } |