diff options
author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-10-17 21:19:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-17 21:19:55 +0200 |
commit | 614182f9e0aab2c639574b2c4c2ce69817206153 (patch) | |
tree | 9a8b782115c3ce026f98ea99a6939b406d9974d4 /pkgs/build-support/php/hooks/composer-install-hook.sh | |
parent | 92a73e8b60783977c3cc04425af830ddef080351 (diff) | |
parent | 839498d572a194efc02e811142024e10f598d33e (diff) |
Merge pull request #261582 from NixOS/php/build-support/fix-diff-and-env-vars
php/build-support: fix `diff` command and env. variables
Diffstat (limited to 'pkgs/build-support/php/hooks/composer-install-hook.sh')
-rw-r--r-- | pkgs/build-support/php/hooks/composer-install-hook.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index 49ff0449719a4..ab7756aef4f12 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -49,7 +49,7 @@ composerInstallConfigureHook() { fi echo "Validating consistency between composer.lock and ${composerRepository}/composer.lock" - if [[! @diff@ composer.lock "${composerRepository}/composer.lock"]]; then + if ! @cmp@ -s "composer.lock" "${composerRepository}/composer.lock"; then echo echo "ERROR: vendorHash is out of date" echo @@ -88,7 +88,6 @@ composerInstallBuildHook() { # Since the composer.json file has been modified in the previous step, the # composer.lock file needs to be updated. - COMPOSER_DISABLE_NETWORK=1 \ COMPOSER_ROOT_VERSION="${version}" \ composer \ --lock \ @@ -118,10 +117,7 @@ composerInstallInstallHook() { # the autoloader. # The COMPOSER_ROOT_VERSION environment variable is needed only for # vimeo/psalm. - COMPOSER_CACHE_DIR=/dev/null \ - COMPOSER_DISABLE_NETWORK=1 \ COMPOSER_ROOT_VERSION="${version}" \ - COMPOSER_MIRROR_PATH_REPOS="1" \ composer \ --no-ansi \ --no-interaction \ |