From d553331b9da0a898f5ba9a7dc86207a7ada5b3d1 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Sun, 19 Nov 2017 22:34:53 -0800 Subject: php: tidySupport option --- pkgs/development/interpreters/php/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs/development/interpreters/php') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3032b5e4c2a1..6a35b0f59e58 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -4,7 +4,7 @@ , mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds -, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium }: +, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, libtidy }: let @@ -230,6 +230,11 @@ let configureFlags = ["--with-sodium=${libsodium.dev}"]; buildInputs = [libsodium]; }; + + tidy = { + configureFlags = [ "--with-tidy=${libtidy}" ]; + buildInputs = [ libtidy ]; + }; }; cfg = { @@ -270,6 +275,7 @@ let ztsSupport = config.php.zts or false; calendarSupport = config.php.calendar or true; sodiumSupport = (lib.versionAtLeast version "7.2") && config.php.sodium or true; + tidySupport = php7 && config.php.tidy or true; }; hardeningDisable = [ "bindnow" ]; -- cgit 1.4.1