diff options
author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-05-02 13:54:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-02 13:54:38 +0200 |
commit | 3be507be1e2ea19b8d53450bac494e2ac30a642c (patch) | |
tree | 8e813e7ce54504e4e8bea1c5e88b216fbd66438d /pkgs | |
parent | 2715377a761ea0232d6db8f938d363d06d6e7727 (diff) | |
parent | e7ad48473141a2a1f421ff8346d743463e192508 (diff) |
Merge pull request #308222 from drupol/build-support/php/remove-makewrapper
build-support/php: remove `makeBinaryWrapper`
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/php/hooks/composer-install-hook.sh | 9 | ||||
-rw-r--r-- | pkgs/build-support/php/hooks/composer-repository-hook.sh | 2 | ||||
-rw-r--r-- | pkgs/build-support/php/hooks/default.nix | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index edba0e5eec4e6..a91263422bc84 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -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" diff --git a/pkgs/build-support/php/hooks/composer-repository-hook.sh b/pkgs/build-support/php/hooks/composer-repository-hook.sh index 762e762761cc4..c4fa0d52126c1 100644 --- a/pkgs/build-support/php/hooks/composer-repository-hook.sh +++ b/pkgs/build-support/php/hooks/composer-repository-hook.sh @@ -23,9 +23,9 @@ composerRepositoryConfigureHook() { setComposeRootVersion composer \ - --no-ansi \ --no-install \ --no-interaction \ + --no-progress \ ${composerNoDev:+--no-dev} \ ${composerNoPlugins:+--no-plugins} \ ${composerNoScripts:+--no-scripts} \ diff --git a/pkgs/build-support/php/hooks/default.nix b/pkgs/build-support/php/hooks/default.nix index 98e81c88f9e96..ca96b1056db9d 100644 --- a/pkgs/build-support/php/hooks/default.nix +++ b/pkgs/build-support/php/hooks/default.nix @@ -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`. |