diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-05-01 11:15:16 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-05-02 16:15:25 +0000 |
| commit | 9a380aa0b333c53618368914cff5915d56f03f98 (patch) | |
| tree | fe613349f46cedccfe95d06079d59357eb1d84d7 | |
| parent | 38688eb3d806a072ff9c8c080ab117a8872c012e (diff) | |
build-support/php: remove `makeBinaryWrapper`
(cherry picked from commit 382220e679c962b65206b25a4abcb983ab04da6e)
| -rw-r--r-- | pkgs/build-support/php/hooks/composer-install-hook.sh | 5 | ||||
| -rw-r--r-- | pkgs/build-support/php/hooks/default.nix | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index edba0e5eec4e..be336c141b29 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -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/default.nix b/pkgs/build-support/php/hooks/default.nix index 98e81c88f9e9..ca96b1056db9 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`. |