diff options
| author | aanderse <aaron@fosslib.net> | 2018-09-17 13:02:16 -0400 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-09-17 19:02:16 +0200 |
| commit | e48811f83d1d2d2a81535f5d8151af5245fd4220 (patch) | |
| tree | 30d69c5f31d69a092a15a2dc237862b274017bed /pkgs/development/interpreters/php/default.nix | |
| parent | 463704a62e3564b951eff84909eeffea4d728130 (diff) | |
| download | nixlib-e48811f83d1d2d2a81535f5d8151af5245fd4220.tar nixlib-e48811f83d1d2d2a81535f5d8151af5245fd4220.tar.gz nixlib-e48811f83d1d2d2a81535f5d8151af5245fd4220.tar.bz2 nixlib-e48811f83d1d2d2a81535f5d8151af5245fd4220.tar.lz nixlib-e48811f83d1d2d2a81535f5d8151af5245fd4220.tar.xz nixlib-e48811f83d1d2d2a81535f5d8151af5245fd4220.tar.zst nixlib-e48811f83d1d2d2a81535f5d8151af5245fd4220.zip | |
php: add option to enable argon2
Diffstat (limited to 'pkgs/development/interpreters/php/default.nix')
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 8310f381fcf0..adffe647c365 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -3,7 +3,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, html-tidy +, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2 }: with lib; @@ -54,6 +54,7 @@ let , calendarSupport ? config.php.calendar or true , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2") , tidySupport ? (config.php.tidy or false) + , argon2Support ? (config.php.argon2 or true) && (versionAtLeast version "7.2") }: let @@ -95,7 +96,8 @@ let ++ optional bz2Support bzip2 ++ optional (mssqlSupport && !stdenv.isDarwin) freetds ++ optional sodiumSupport libsodium - ++ optional tidySupport html-tidy; + ++ optional tidySupport html-tidy + ++ optional argon2Support libargon2; CXXFLAGS = optional stdenv.cc.isClang "-std=c++11"; @@ -160,7 +162,8 @@ let ++ optional ztsSupport "--enable-maintainer-zts" ++ optional calendarSupport "--enable-calendar" ++ optional sodiumSupport "--with-sodium=${libsodium.dev}" - ++ optional tidySupport "--with-tidy=${html-tidy}"; + ++ optional tidySupport "--with-tidy=${html-tidy}" + ++ optional argon2Support "--with-password-argon2=${libargon2}"; hardeningDisable = [ "bindnow" ]; |