darkkirb/composer2nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12 from christian-blades-cb/fixup-phpnotfound

Browse source 
call php scripts via php interpreter instead of relying on shebang
This commit is contained in:
Sander van der Burg 2021-02-27 13:51:03 +01:00 committed by GitHub
commit 6fe8f203e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Composer2Nix/composer-env.nix
View file

@ -175,7 +175,7 @@ let
# Reconstruct the installed.json file from the lock file # Reconstruct the installed.json file from the lock file
mkdir -p vendor/composer mkdir -p vendor/composer
${reconstructInstalled} composer.lock > vendor/composer/installed.json ${php}/bin/php ${reconstructInstalled} composer.lock > vendor/composer/installed.json
# Copy or symlink the provided dependencies # Copy or symlink the provided dependencies
cd vendor cd vendor
@ -193,7 +193,7 @@ let
${lib.optionalString executable '' ${lib.optionalString executable ''
# Reconstruct the bin/ folder if we deploy an executable project # Reconstruct the bin/ folder if we deploy an executable project
${constructBin} composer.json ${php}/bin/php ${constructBin} composer.json
ln -s $(pwd)/vendor/bin $out/bin ln -s $(pwd)/vendor/bin $out/bin
''} ''}