Merge pull request #255156 from NixOS/build-support/php/update-instal…

…l-procedure build-support/php: prevent the creation of symlinks
NixOS · Sep 15, 2023 · 28fd868 · 28fd868
2 parents ee9751f + a2f8623
commit 28fd868
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh
@@ -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"

diff --git a/pkgs/build-support/php/hooks/default.nix b/pkgs/build-support/php/hooks/default.nix
@@ -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;
 }