colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

php81Extensions.tokenizer: fix build

Browse Source 
(cherry picked from commit cf7f4c058e822ee8eeaa2120c45f04b5b460a5db)
This commit is contained in:
Stéphan Kochen 2021-12-20 14:09:56 +01:00 committed by Pol Dellaiera
parent 4e9870ffa2
commit 2dbf96e7cc
No known key found for this signature in database
GPG Key ID: D476DFE9C67467CA
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/interpreters/php/fix-tokenizer-php81.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/ext/tokenizer/Makefile.frag b/ext/tokenizer/Makefile.frag
index 745cbfce91..07bace6022 100644
--- a/ext/tokenizer/Makefile.frag
+++ b/ext/tokenizer/Makefile.frag
@@ -1,5 +1,5 @@
-$(top_srcdir)/ext/tokenizer/tokenizer_data.c: $(top_srcdir)/Zend/zend_language_parser.y
+$(top_srcdir)/tokenizer_data.c: $(top_srcdir)/../../Zend/zend_language_parser.y
@if test ! -z "$(PHP)"; then \
$(PHP) $(srcdir)/tokenizer_data_gen.php; \
fi;
-$(builddir)/tokenizer.lo: $(top_srcdir)/Zend/zend_language_parser.c $(top_srcdir)/Zend/zend_language_scanner.c
+$(builddir)/tokenizer.lo: $(top_srcdir)/../../Zend/zend_language_parser.c $(top_srcdir)/../../Zend/zend_language_scanner.c

6
pkgs/top-level/php-packages.nix
View File

@ -543,7 +543,11 @@ lib.makeScope pkgs.newScope (self: with self; {
{ name = "sysvsem"; }
{ name = "sysvshm"; }
{ name = "tidy"; configureFlags = [ "--with-tidy=${html-tidy}" ]; doCheck = false; }
{ name = "tokenizer"; }
{
name = "tokenizer";
patches = lib.optional (lib.versionAtLeast php.version "8.1")
../development/interpreters/php/fix-tokenizer-php81.patch;
}
{
name = "wddx";
buildInputs = [ libxml2 ];