alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

php.extensions.{mongodb,intl}: switch back to icu64

Browse source 
See https://hydra.nixos.org/build/124676672
Introduced by 4afdb415d2
Closes #94798
This commit is contained in:
Maximilian Bosch 2020-08-06 18:21:43 +02:00
parent c0583cbf62
commit cecc4ce361
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c { stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c
, gettext, bzip2, curl, libxml2, openssl, gmp, icu, oniguruma, libsodium , gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium
, 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
@ -547,7 +547,7 @@ in
nativeBuildInputs = [ pkgs.pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
cyrus_sasl cyrus_sasl
icu icu64
openssl openssl
snappy snappy
zlib zlib
@ -972,7 +972,7 @@ in
enable = (!stdenv.isDarwin); } enable = (!stdenv.isDarwin); }
# interbase (7.3, 7.2) # interbase (7.3, 7.2)
{ name = "intl"; { name = "intl";
buildInputs = [ icu ]; buildInputs = [ icu64 ];
patches = lib.optional (lib.versionOlder php.version "7.4") (fetchpatch { patches = lib.optional (lib.versionOlder php.version "7.4") (fetchpatch {
url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch"; url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch";
sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4"; sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4";