diff options
author | Elis Hirwing <elis@hirwing.se> | 2023-09-15 08:39:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-15 08:39:55 +0200 |
commit | 28fd868e47de0b7f32551bd980adaa81489079b7 (patch) | |
tree | 81b345002fcc7bbb4f0f4259849df386874a60a1 /pkgs/build-support | |
parent | ee9751f3877aa999f0f999a9fcb43cddb1fdce21 (diff) | |
parent | a2f8623363e186271cbe2abae1bcac429d49c340 (diff) |
Merge pull request #255156 from NixOS/build-support/php/update-install-procedure
build-support/php: prevent the creation of symlinks
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/php/hooks/composer-install-hook.sh | 2 | ||||
-rw-r--r-- | pkgs/build-support/php/hooks/default.nix | 7 |
2 files changed, 5 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 9f23b90fa401d..bb6cb47e861b9 100644 --- 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 index 98198f0128795..e7de98647c397 100644 --- 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; } |