BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build-support/php: phpDrv in nativeBuildInputs

Browse source 
Fixes NixOS/nixpkgs#261500
This commit is contained in:
Lorenz Leutgeb 2023-10-17 11:08:10 +02:00
parent 6d84d21ffd
commit e7076170f0
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/build-support/php/build-composer-project.nix
View file

@ -17,6 +17,7 @@ let
nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [
composer composer
composer-local-repo-plugin composer-local-repo-plugin
phpDrv
phpDrv.composerHooks.composerInstallHook phpDrv.composerHooks.composerInstallHook
]; ];

1
pkgs/build-support/php/build-composer-repository.nix
View file

@ -41,6 +41,7 @@ let
nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [
composer composer
composer-local-repo-plugin composer-local-repo-plugin
phpDrv
phpDrv.composerHooks.composerRepositoryHook phpDrv.composerHooks.composerRepositoryHook
]; ];

5
pkgs/build-support/php/hooks/default.nix
View file

@ -3,7 +3,6 @@
, jq , jq
, moreutils , moreutils
, makeBinaryWrapper , makeBinaryWrapper
, php
, cacert , cacert
, buildPackages , buildPackages
}: }:
@ -12,14 +11,14 @@
composerRepositoryHook = makeSetupHook composerRepositoryHook = makeSetupHook
{ {
name = "composer-repository-hook.sh"; name = "composer-repository-hook.sh";
propagatedBuildInputs = [ jq moreutils php cacert ]; propagatedBuildInputs = [ jq moreutils cacert ];
substitutions = { }; substitutions = { };
} ./composer-repository-hook.sh; } ./composer-repository-hook.sh;
composerInstallHook = makeSetupHook composerInstallHook = makeSetupHook
{ {
name = "composer-install-hook.sh"; name = "composer-install-hook.sh";
propagatedBuildInputs = [ jq makeBinaryWrapper moreutils php cacert ]; propagatedBuildInputs = [ jq makeBinaryWrapper moreutils cacert ];
substitutions = { substitutions = {
# Specify the stdenv's `diff` by abspath to ensure that the user's build # Specify the stdenv's `diff` by abspath to ensure that the user's build
# inputs do not cause us to find the wrong `diff`. # inputs do not cause us to find the wrong `diff`.