diff options
| author | Oleg Pykhalov <go.wigust@gmail.com> | 2018-07-18 00:04:40 +0300 |
|---|---|---|
| committer | Oleg Pykhalov <go.wigust@gmail.com> | 2018-07-18 13:54:02 +0300 |
| commit | 1a144d6d84f94c79c56ccbf66002cabb10c0d053 (patch) | |
| tree | f551ade3437a2a39aea3c5780c9d89f155574df5 | |
| parent | bazel: 0.15 -> 0.15.1 (diff) | |
| download | nixpkgs-github/zabbix-deprecate-mbstrings.tar.gz | |
zabbix: Patch mbstring.local/zabbix-deprecate-mbstringsgithub/zabbix-deprecate-mbstringszabbix-deprecate-mbstrings
| -rw-r--r-- | pkgs/servers/monitoring/zabbix/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/zabbix/deprecate-mbstring-internal-encoding.patch | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index be52698ed839..39440ea5e5e9 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -25,6 +25,8 @@ in server = stdenv.mkDerivation { name = "zabbix-${version}"; + patches = [ ./deprecate-mbstring-internal-encoding.patch ]; + inherit src preConfigure; configureFlags = "--enable-agent --enable-server --with-pgsql --with-libcurl"; diff --git a/pkgs/servers/monitoring/zabbix/deprecate-mbstring-internal-encoding.patch b/pkgs/servers/monitoring/zabbix/deprecate-mbstring-internal-encoding.patch new file mode 100644 index 000000000000..7d3ba1c4f6c5 --- /dev/null +++ b/pkgs/servers/monitoring/zabbix/deprecate-mbstring-internal-encoding.patch @@ -0,0 +1,10 @@ +--- a/frontends/php/include/locales.inc.php 1970-01-01 03:00:01.000000000 +0300 ++++ b/frontends/php/include/locales.inc.php 2018-07-18 00:18:43.675742896 +0300 +@@ -24,7 +24,6 @@ + + $res &= mbstrings_available(); + +- ini_set('mbstring.internal_encoding', 'UTF-8'); + $res &= (ini_get('mbstring.internal_encoding') == 'UTF-8'); + + ini_set('mbstring.detect_order', 'UTF-8, ISO-8859-1, JIS, SJIS'); |