From 1d2dff45d3f3b8820f0f48d162813c128bc9e4df Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 12 May 2024 08:54:43 +0200 Subject: php: fix build on darwin (the `iconv` extension) https://hydra.nixos.org/build/258946784/nixlog/2/tail The issue was probably triggered by the darwin iconv changes done during this staging-next cycle. Also use enable tests on linux, as they pass for me on native x86_64 and aarch64. --- pkgs/top-level/php-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e5bcc7ba3c59f..6a5e16185601b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -428,10 +428,9 @@ in { } { name = "iconv"; - configureFlags = [ - "--with-iconv${lib.optionalString stdenv.isDarwin "=${libiconv}"}" - ]; - doCheck = false; + buildInputs = [ libiconv ]; + configureFlags = [ "--with-iconv" ]; + doCheck = stdenv.isLinux; } { name = "imap"; -- cgit 1.4.1