Merge pull request #255156 from NixOS/build-support/php/update-install-procedure

build-support/php: prevent the creation of symlinks
This commit is contained in:
Elis Hirwing 2023-09-15 08:39:55 +02:00 committed by GitHub
commit 28fd868e47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View File

@ -106,7 +106,7 @@ composerInstallInstallHook() {
# Create symlinks for the binaries.
jq -r -c 'try .bin[]' composer.json | while read -r bin; do
mkdir -p "$out"/share/php/"${pname}" "$out"/bin
ln -s "$out"/share/php/"${pname}"/"$bin" "$out"/bin/"$(basename "$bin")"
makeWrapper "$out"/share/php/"${pname}"/"$bin" "$out"/bin/"$(basename "$bin")"
done
echo "Finished composerInstallInstallHook"

View File

@ -1,21 +1,22 @@
{ makeSetupHook
, php
, jq
, moreutils
, makeBinaryWrapper
, php
}:
{
composerRepositoryHook = makeSetupHook
{
name = "composer-repository-hook.sh";
propagatedBuildInputs = [ php jq moreutils ];
propagatedBuildInputs = [ jq moreutils php ];
substitutions = { };
} ./composer-repository-hook.sh;
composerInstallHook = makeSetupHook
{
name = "composer-install-hook.sh";
propagatedBuildInputs = [ php jq moreutils ];
propagatedBuildInputs = [ jq makeBinaryWrapper moreutils php ];
substitutions = { };
} ./composer-install-hook.sh;
}