File tree 1 file changed +12
-10
lines changed
1 file changed +12
-10
lines changed Original file line number Diff line number Diff line change 575
575
ourPatches ++ upstreamPatches ;
576
576
577
577
nativeBuildInputs = attrs . nativeBuildInputs ++ [
578
+ # Tarballs ship pre-generated parser files.
578
579
pkgs . bison
580
+ pkgs . flex
579
581
] ;
580
582
581
583
postPatch = ''
720
722
patchName patch == "fix-tokenizer-php81.patch" -> lib . versionAtLeast prev . php . version "8.1"
721
723
)
722
724
( attrs . patches or [ ] ) ;
723
- } ) ;
724
725
725
- tokenizer = prev . extensions . tokenizer . overrideAttrs ( attrs : {
726
- patches = builtins . filter
727
- ( patch :
728
- # The patch do not apply to PHP < 8.1
729
- patchName patch == "fix-tokenizer-php81.patch" -> lib . versionAtLeast prev . php . version "8.1"
730
- )
731
- ( attrs . patches or [ ] ) ;
732
-
733
- nativeBuildInputs = attrs . nativeBuildInputs or [ ] ++ lib . optionals isBuiltFromGit [
726
+ nativeBuildInputs = attrs . nativeBuildInputs ++ [
734
727
# Tarballs ship pre-generated parser files.
735
728
pkgs . bison
736
729
pkgs . flex
737
730
] ;
738
731
732
+ postPatch = ''
733
+ echo '
734
+ # TODO: Add explanation here.
735
+ # See https://github.com/fossar/nix-phps/pull/104#issuecomment-1113964195
736
+ PHP_PROG_BISON([3.0.0])
737
+ PHP_PROG_RE2C([0.13.4])
738
+ ' | cat - ext/tokenizer/config.m4 > ext/tokenizer/config.m4.tmp
739
+ mv ext/tokenizer/config.m4{.tmp,}
740
+ '' ;
739
741
} ) ;
740
742
741
743
wddx =
You can’t perform that action at this time.
0 commit comments