swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31849 from elitak/tidySupport

Browse source 
php: tidySupport option
This commit is contained in:
Matthew Bauer 2018-07-23 12:25:15 -04:00 committed by GitHub
parent 6d880d2d5b d553331b9d
commit ca766205ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/interpreters/php/default.nix
View file

@ -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" ];