summary refs log tree commit diff
path: root/pkgs/development/interpreters/php/default.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-12-13 11:43:39 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-12-13 11:43:39 +0100
commitdfdf1597a7cc13c40653722a771be12afaa64edb (patch)
tree4d7cd3f21ba89453f23ea1addb55e00574a638bf /pkgs/development/interpreters/php/default.nix
parentd5d8b3514d64fcd4022186795f604ec3f360ae17 (diff)
parent418ad571c3ec856d49b65fa53ab99f185c2d9def (diff)
downloadnixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar
nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.gz
nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.bz2
nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.lz
nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.xz
nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.zst
nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters/php/default.nix')
-rw-r--r--pkgs/development/interpreters/php/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index a91490c200c..aa6dbcfccf0 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -182,6 +182,7 @@ let
       ++ optional mcryptSupport "--with-mcrypt=${libmcrypt'}"
       ++ optional bz2Support "--with-bz2=${bzip2.dev}"
       ++ optional (zipSupport && (versionOlder version "7.4")) "--enable-zip"
+      ++ optional (zipSupport && (versionAtLeast version "7.4")) "--with-zip"
       ++ optional ftpSupport "--enable-ftp"
       ++ optional fpmSupport "--enable-fpm"
       ++ optional ztsSupport "--enable-maintainer-zts"