From da8ca2be2ffd5964684fa81b953f933c9beaa7ed Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 22 Mar 2020 19:16:13 +0100 Subject: [PATCH] phpPackages.exts.gmp: Enable on darwin --- pkgs/top-level/php-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index bfd55b33532..ab0abf7b26b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c -, bzip2, curl, libxml2, openssl, gmp5, icu, oniguruma, libsodium, html-tidy +, bzip2, curl, libxml2, openssl, gmp, icu, oniguruma, libsodium, html-tidy , libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl, uwimap , pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng, freetype , libffi, freetds, postgresql, sqlite, recode, net-snmp, unixODBC }: @@ -780,10 +780,8 @@ let ]; enable = lib.versionOlder php.version "7.4"; } { name = "gmp"; - buildInputs = [ gmp5 ]; - configureFlags = [ "--with-gmp=${gmp5.dev}" ]; - # gmp5 doesn't build on darwin. - enable = (!stdenv.isDarwin); } + buildInputs = [ gmp ]; + configureFlags = [ "--with-gmp=${gmp.dev}" ]; } { name = "hash"; enable = lib.versionOlder php.version "7.4"; } { name = "iconv"; configureFlags = if stdenv.isDarwin then [ "--with-iconv=${libiconv}" ]