File tree Expand file tree Collapse file tree 2 files changed +18
-11
lines changed Expand file tree Collapse file tree 2 files changed +18
-11
lines changed Original file line number Diff line number Diff line change 13
13
url = "https://github.com/NixOS/nixpkgs/raw/42e9a2ccfab2a96d28c3c164a6cf41fb6f769de5/pkgs/development/interpreters/php/php73-darwin-isfinite.patch" ;
14
14
sha256 = "V0mLLmXa2qJyxIVW/7nEml6cXZTBbr42kkJiij9KPyk=" ;
15
15
} )
16
- # Handle macos versions that don't start with 10.* in libtool.
17
- # https://github.com/php/php-src/commit/d016434ad33284dfaceb8d233351d34356566d7d
18
- ( prev . pkgs . fetchpatch2 {
19
- url = "https://github.com/php/php-src/commit/d016434ad33284dfaceb8d233351d34356566d7d.patch" ;
20
- sha256 = "sha256-x0vEcoXNFeQi3re1TrK/Np9AH5dy3wf95xM08xCyGE0=" ;
21
- includes = [
22
- "build/libtool.m4"
23
- ] ;
24
- } )
25
16
] ;
26
17
} ;
27
18
in
Original file line number Diff line number Diff line change 33
33
url = "https://bugs.php.net/patch-display.php?bug_id=76826&patch=bug76826.poc.0.patch&revision=1538723399&download=1" ;
34
34
sha256 = "aW+MW9Kb8N/yBO7MdqZMZzgMSF7b+IMLulJKgKPWrUA=" ;
35
35
} )
36
+ ]
37
+ ++ prev . lib . optionals ( prev . lib . versionOlder args . version "7.4" && prev . stdenv . isDarwin ) [
38
+ # Handle macos versions that don't start with 10.* in libtool.
39
+ # https://github.com/php/php-src/commit/d016434ad33284dfaceb8d233351d34356566d7d
40
+ ( prev . pkgs . fetchpatch2 {
41
+ url = "https://github.com/php/php-src/commit/d016434ad33284dfaceb8d233351d34356566d7d.patch" ;
42
+ sha256 = "sha256-x0vEcoXNFeQi3re1TrK/Np9AH5dy3wf95xM08xCyGE0=" ;
43
+ includes = [
44
+ "build/libtool.m4"
45
+ ] ;
46
+ } )
36
47
] ;
37
48
38
49
configureFlags =
43
54
44
55
"--enable-libxml"
45
56
"--with-libxml-dir=${ prev . libxml2 . dev } "
57
+ (
58
+ if prev . lib . versionAtLeast args . version "7.3"
59
+ then "--with-pcre-regex=${ prev . pcre2 . dev } "
60
+ else "--with-pcre-regex=${ prev . pcre . dev } "
61
+ )
46
62
]
47
- ++ prev . lib . optionals ( prev . lib . versionAtLeast args . version "7.3" ) [
48
- "--with-pcre-regex =${ prev . pcre2 . dev } "
63
+ ++ prev . lib . optionals ( prev . lib . versionOlder args . version "7.3" ) [
64
+ "PCRE_LIBDIR =${ prev . pcre } "
49
65
] ;
50
66
51
67
buildInputs =
You can’t perform that action at this time.
0 commit comments