summary refs log tree commit diff
path: root/pkgs/development/interpreters/php
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-07-23 12:25:15 -0400
committerGitHub <noreply@github.com>2018-07-23 12:25:15 -0400
commitca766205ffbf9431165aa2a528f1b64d8a37e89b (patch)
tree225fb2c0c4edb380fc1abf243c0a27603b71b15e /pkgs/development/interpreters/php
parent6d880d2d5b1fd53c25206d07ed33c4004fe0af13 (diff)
parentd553331b9da0a898f5ba9a7dc86207a7ada5b3d1 (diff)
downloadnixpkgs-ca766205ffbf9431165aa2a528f1b64d8a37e89b.tar
nixpkgs-ca766205ffbf9431165aa2a528f1b64d8a37e89b.tar.gz
nixpkgs-ca766205ffbf9431165aa2a528f1b64d8a37e89b.tar.bz2
nixpkgs-ca766205ffbf9431165aa2a528f1b64d8a37e89b.tar.lz
nixpkgs-ca766205ffbf9431165aa2a528f1b64d8a37e89b.tar.xz
nixpkgs-ca766205ffbf9431165aa2a528f1b64d8a37e89b.tar.zst
nixpkgs-ca766205ffbf9431165aa2a528f1b64d8a37e89b.zip
Merge pull request #31849 from elitak/tidySupport
php: tidySupport option
Diffstat (limited to 'pkgs/development/interpreters/php')
-rw-r--r--pkgs/development/interpreters/php/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 52a3c64f81c..7a96b8abe5a 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" ];