diff options
| author | Lorenz Leutgeb <lorenz@leutgeb.xyz> | 2023-10-17 11:08:10 +0200 |
|---|---|---|
| committer | Lorenz Leutgeb <lorenz@leutgeb.xyz> | 2023-10-17 12:50:37 +0200 |
| commit | e7076170f04907a1b64a906ce16ba734f8bd5c27 (patch) | |
| tree | b998908ae91218d1899249b9b4a29cd20ba3c4f6 | |
| parent | 6d84d21ffd30986ff180cdbf87aba41433369d98 (diff) | |
build-support/php: `phpDrv` in `nativeBuildInputs`
Fixes NixOS/nixpkgs#261500
| -rw-r--r-- | pkgs/build-support/php/build-composer-project.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/php/build-composer-repository.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/php/hooks/default.nix | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/build-composer-project.nix index 1386fc6188c45..f244f5b6ac328 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/pkgs/build-support/php/build-composer-project.nix @@ -17,6 +17,7 @@ let nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ composer composer-local-repo-plugin + phpDrv phpDrv.composerHooks.composerInstallHook ]; diff --git a/pkgs/build-support/php/build-composer-repository.nix b/pkgs/build-support/php/build-composer-repository.nix index 55f427bbca72d..9487b61e16cb8 100644 --- a/pkgs/build-support/php/build-composer-repository.nix +++ b/pkgs/build-support/php/build-composer-repository.nix @@ -41,6 +41,7 @@ let nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ composer composer-local-repo-plugin + phpDrv phpDrv.composerHooks.composerRepositoryHook ]; diff --git a/pkgs/build-support/php/hooks/default.nix b/pkgs/build-support/php/hooks/default.nix index c19bc757581f2..7b56cd6d8b80c 100644 --- a/pkgs/build-support/php/hooks/default.nix +++ b/pkgs/build-support/php/hooks/default.nix @@ -3,7 +3,6 @@ , jq , moreutils , makeBinaryWrapper -, php , cacert , buildPackages }: @@ -12,14 +11,14 @@ composerRepositoryHook = makeSetupHook { name = "composer-repository-hook.sh"; - propagatedBuildInputs = [ jq moreutils php cacert ]; + propagatedBuildInputs = [ jq moreutils cacert ]; substitutions = { }; } ./composer-repository-hook.sh; composerInstallHook = makeSetupHook { name = "composer-install-hook.sh"; - propagatedBuildInputs = [ jq makeBinaryWrapper moreutils php cacert ]; + propagatedBuildInputs = [ jq makeBinaryWrapper moreutils cacert ]; substitutions = { # Specify the stdenv's `diff` by abspath to ensure that the user's build # inputs do not cause us to find the wrong `diff`. |