diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index d60d0cdf1fd1..cee1e833f9a6 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -271,8 +271,8 @@ let ./buildconf --copy --force - if test -f $src/genfiles; then - ./genfiles + if [ -f "scripts/dev/genfiles" ]; then + ./scripts/dev/genfiles fi '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "-lstdc++" "-lc++" diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f60ae14cf585..2e810ca09927 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -31,6 +31,7 @@ , pam , pcre2 , postgresql +, bison , re2c , readline , rsync @@ -101,14 +102,22 @@ lib.makeScope pkgs.newScope (self: with self; { autoconf pkg-config re2c + bison ]; inherit configureFlags internalDeps buildInputs zendExtension doCheck; preConfigurePhases = [ + "genfiles" "cdToExtensionRootPhase" ]; + genfiles = '' + if [ -f "scripts/dev/genfiles" ]; then + ./scripts/dev/genfiles + fi + ''; + cdToExtensionRootPhase = '' # Go to extension source root. cd "ext/${extName}"