gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #261595 from lorenzleutgeb/php

Browse Source 
build-support/php: `phpDrv` in `nativeBuildInputs`
This commit is contained in:
Pol Dellaiera
2023-10-17 14:34:06 +02:00
committed by GitHub
parent c3d810b81c e7076170f0
commit d95cdde569
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/php/build-composer-project.nix
+1
View File
@@ -17,6 +17,7 @@ let
nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [
composer
composer-local-repo-plugin
phpDrv
phpDrv.composerHooks.composerInstallHook
];
pkgs/build-support/php/build-composer-repository.nix
+1
View File
@@ -41,6 +41,7 @@ let
nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [
composer
composer-local-repo-plugin
phpDrv
phpDrv.composerHooks.composerRepositoryHook
];
pkgs/build-support/php/hooks/default.nix
+2 -3
View File
@@ -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`.