nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-11 01:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/php/hooks/composer-install-hook.sh
View File

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

7
pkgs/build-support/php/hooks/default.nix
View File

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