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

php7{2,3}: intl: fix aarch64 build

Browse Source
This commit is contained in:
Maximilian Bosch 2020-06-25 18:27:57 +02:00
parent 1d805c99bd
commit 30e812c6c0
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
, html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl
, uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng
, freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit , freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit
, readline, rsync , readline, rsync, fetchpatch
}: }:
let let
@ -965,7 +965,13 @@ in
# uwimap doesn't build on darwin. # uwimap doesn't build on darwin.
enable = (!stdenv.isDarwin); } enable = (!stdenv.isDarwin); }
# interbase (7.3, 7.2) # interbase (7.3, 7.2)
{ name = "intl"; buildInputs = [ icu ]; } { name = "intl";
buildInputs = [ icu ];
patches = lib.optional (lib.versionOlder php.version "7.4") (fetchpatch {
url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch";
sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4";
});
}
{ name = "json"; } { name = "json"; }
{ name = "ldap"; { name = "ldap";
buildInputs = [ openldap cyrus_sasl ]; buildInputs = [ openldap cyrus_sasl ];