summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2021-06-01 21:00:19 +0100
committerGitHub <noreply@github.com>2021-06-01 21:00:19 +0100
commit5237039cc1e7633a7697ed7999afd1f80d91ff14 (patch)
tree965b2a064a3d95c61c35944de0fafd2595deb2cc
parentMerge pull request #125269 from NixOS/backport-125245-to-release-21.05 (diff)
parentphp.buildPecl: Add checkPhase (diff)
downloadnixpkgs-5237039cc1e7633a7697ed7999afd1f80d91ff14.tar.gz
Merge pull request #125230 from NixOS/backport-124603-to-release-21.05
[Backport release-21.05] php.buildPecl: Add checkPhase
-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