about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2024-05-12 08:54:43 +0200
committerVladimír Čunát <v@cunat.cz>2024-05-12 08:54:43 +0200
commit1d2dff45d3f3b8820f0f48d162813c128bc9e4df (patch)
tree7ef44d561bca0f21509f7384d8210ad660091150
parent8101e67b3d7124a49839e9ff064e813941160ba3 (diff)
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.
-rw-r--r--pkgs/top-level/php-packages.nix7
1 files 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";