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

Merge pull request #308222 from drupol/build-support/php/remove-makewrapper 

build-support/php: remove `makeBinaryWrapper`
parents 2715377a e7ad4847

pkgs/build-support/php/hooks/composer-install-hook.sh

+5 −4
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ composerInstallConfigureHook() { 
        setComposeRootVersion



        composer \

            --no-ansi \

            --no-install \

            --no-interaction \

            --no-progress \

            ${composerNoDev:+--no-dev} \

            ${composerNoPlugins:+--no-plugins} \

            ${composerNoScripts:+--no-scripts} \
@@ -104,8 +104,8 @@ composerInstallInstallHook() { 
    # Finally, run `composer install` to install the dependencies and generate

    # the autoloader.

    composer \

      --no-ansi \

      --no-interaction \

      --no-progress \

      ${composerNoDev:+--no-dev} \

      ${composerNoPlugins:+--no-plugins} \

      ${composerNoScripts:+--no-scripts} \
@@ -117,8 +117,9 @@ composerInstallInstallHook() { 


    # Create symlinks for the binaries.

    jq -r -c 'try (.bin[] | select(test(".bat$")? | not) )' composer.json | while read -r bin; do

        mkdir -p "$out"/share/php/"${pname}" "$out"/bin

        makeWrapper "$out"/share/php/"${pname}"/"$bin" "$out"/bin/"$(basename "$bin")"

        echo -e "\e[32mCreating symlink ${bin}...\e[0m"

        mkdir -p "$out"/bin

        ln -s "$out"/share/php/"${pname}"/"$bin" "$out"/bin/"$(basename "$bin")"

    done



    echo "Finished composerInstallInstallHook"

pkgs/build-support/php/hooks/composer-repository-hook.sh

+1 −1
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ composerRepositoryConfigureHook() { 
        setComposeRootVersion



        composer \

            --no-ansi \

            --no-install \

            --no-interaction \

            --no-progress \

            ${composerNoDev:+--no-dev} \

            ${composerNoPlugins:+--no-plugins} \

            ${composerNoScripts:+--no-scripts} \

pkgs/build-support/php/hooks/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
, jq

, writeShellApplication

, moreutils

, makeBinaryWrapper

, cacert

, buildPackages

}:
@@ -29,7 +28,7 @@ in 
  composerInstallHook = makeSetupHook

    {

      name = "composer-install-hook.sh";

      propagatedBuildInputs = [ jq makeBinaryWrapper moreutils cacert ];

      propagatedBuildInputs = [ jq 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`.