summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Sirabella <marco@sirabella.org>2021-05-27 12:13:16 -0400
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-06-01 14:38:16 +0000
commit89e61ccf696a7de01bd2cc853dbcd301dbf84f0e (patch)
tree0e8b91de8651177d96d6de2fbee7cca765b273a2
parentMerge pull request #125226 from NixOS/backport-124892-to-release-21.05 (diff)
downloadnixpkgs-89e61ccf696a7de01bd2cc853dbcd301dbf84f0e.tar.gz
php.buildPecl: Add checkPhase
Also update phpPackages' to use NO_INTERACTION (cherry picked from commit 3a66432f2616484c880b6daea2393bf1e9425a33)
-rw-r--r--pkgs/build-support/build-pecl.nix1
-rw-r--r--pkgs/top-level/php-packages.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix
index d75d3cf943a0..d3a8cc54a146 100644
--- a/pkgs/build-support/build-pecl.nix
+++ b/pkgs/build-support/build-pecl.nix
@@ -33,4 +33,5 @@ stdenv.mkDerivation (args // {
(dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}")
internalDeps}
'';
+ checkPhase = "NO_INTERACTON=yes make test";
})
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 0f61402bb05e..c59391ce2907 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -235,7 +235,7 @@ lib.makeScope pkgs.newScope (self: with self; {
(dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}")
internalDeps}
'';
- checkPhase = "runHook preCheck; echo n | make test; runHook postCheck";
+ checkPhase = "runHook preCheck; NO_INTERACTON=yes make test; runHook postCheck";
outputs = [ "out" "dev" ];
installPhase = ''
mkdir -p $out/lib/php/extensions