diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-08-06 18:21:43 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-08-06 18:25:00 +0200 |
| commit | cecc4ce36184fb1051ac6924ebf5d65b5e0668aa (patch) | |
| tree | 4e4c7462bde58b166c8fbc736617851fa250f069 /pkgs/top-level/php-packages.nix | |
| parent | c0583cbf6288e229cbfe6c77e42bb1632ffb6cc4 (diff) | |
| download | nixpkgs-cecc4ce36184fb1051ac6924ebf5d65b5e0668aa.tar nixpkgs-cecc4ce36184fb1051ac6924ebf5d65b5e0668aa.tar.gz nixpkgs-cecc4ce36184fb1051ac6924ebf5d65b5e0668aa.tar.bz2 nixpkgs-cecc4ce36184fb1051ac6924ebf5d65b5e0668aa.tar.lz nixpkgs-cecc4ce36184fb1051ac6924ebf5d65b5e0668aa.tar.xz nixpkgs-cecc4ce36184fb1051ac6924ebf5d65b5e0668aa.tar.zst nixpkgs-cecc4ce36184fb1051ac6924ebf5d65b5e0668aa.zip | |
php.extensions.{mongodb,intl}: switch back to icu64
See https://hydra.nixos.org/build/124676672 Introduced by 4afdb415d2147d60f1fb2aa24dc07c14fa4f6b59 Closes #94798
Diffstat (limited to 'pkgs/top-level/php-packages.nix')
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e45f9a5bf15..578dcaf761b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,5 +1,5 @@ { 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 , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng , freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit @@ -547,7 +547,7 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ cyrus_sasl - icu + icu64 openssl snappy zlib @@ -972,7 +972,7 @@ in enable = (!stdenv.isDarwin); } # interbase (7.3, 7.2) { name = "intl"; - buildInputs = [ icu ]; + buildInputs = [ icu64 ]; patches = lib.optional (lib.versionOlder php.version "7.4") (fetchpatch { url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch"; sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4"; |