diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-17 18:01:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-17 18:01:44 +0000 |
| commit | c99731d9ac7f60c5448fc9a94489856f28971daa (patch) | |
| tree | 1bdd506b840c8deb832857a6121abb966e15c78d /pkgs/build-support | |
| parent | 0b1d0df88f08d6fed706bcd099009426db98c9a2 (diff) | |
| parent | 14b83b5e055518177178d9f496cc95b764712d71 (diff) | |
| download | nixpkgs-c99731d9ac7f60c5448fc9a94489856f28971daa.tar nixpkgs-c99731d9ac7f60c5448fc9a94489856f28971daa.tar.gz nixpkgs-c99731d9ac7f60c5448fc9a94489856f28971daa.tar.bz2 nixpkgs-c99731d9ac7f60c5448fc9a94489856f28971daa.tar.lz nixpkgs-c99731d9ac7f60c5448fc9a94489856f28971daa.tar.xz nixpkgs-c99731d9ac7f60c5448fc9a94489856f28971daa.tar.zst nixpkgs-c99731d9ac7f60c5448fc9a94489856f28971daa.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -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 1386fc6188c..f244f5b6ac3 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 55f427bbca7..9487b61e16c 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 c19bc757581..7b56cd6d8b8 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`. |