Unverified Commit d95cdde5 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #261595 from lorenzleutgeb/php 

build-support/php: `phpDrv` in `nativeBuildInputs`
parents c3d810b8 e7076170

pkgs/build-support/php/build-composer-project.nix

+1 −0
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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`.