diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-10-17 08:48:58 +0200 |
|---|---|---|
| committer | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-10-17 08:48:58 +0200 |
| commit | 839498d572a194efc02e811142024e10f598d33e (patch) | |
| tree | 921c5430d8b2b39972f849bf777681530f218ee3 | |
| parent | 207d5b4910b17b08b47a85d417bdbae00c6febf2 (diff) | |
php/build-support: fix usage of environment variables
| -rw-r--r-- | pkgs/build-support/php/build-composer-project.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/php/hooks/composer-install-hook.sh | 4 | ||||
| -rw-r--r-- | pkgs/build-support/php/hooks/composer-repository-hook.sh | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/build-composer-project.nix index 1386fc6188c45..9f28b66b78924 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/pkgs/build-support/php/build-composer-project.nix @@ -70,6 +70,10 @@ let composerNoScripts = previousAttrs.composerNoScripts or true; }; + COMPOSER_CACHE_DIR="/dev/null"; + COMPOSER_DISABLE_NETWORK="1"; + COMPOSER_MIRROR_PATH_REPOS="1"; + meta = previousAttrs.meta or { } // { platforms = lib.platforms.all; }; diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index 09bd19e69b27e..ab7756aef4f12 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -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 \ diff --git a/pkgs/build-support/php/hooks/composer-repository-hook.sh b/pkgs/build-support/php/hooks/composer-repository-hook.sh index 3aae1f9fa85d8..2c35b11b73b4f 100644 --- a/pkgs/build-support/php/hooks/composer-repository-hook.sh +++ b/pkgs/build-support/php/hooks/composer-repository-hook.sh @@ -55,7 +55,6 @@ composerRepositoryBuildHook() { # Build the local composer repository # The command 'build-local-repo' is provided by the Composer plugin # nix-community/composer-local-repo-plugin. - COMPOSER_CACHE_DIR=/dev/null \ composer-local-repo-plugin --no-ansi build-local-repo ${composerNoDev:+--no-dev} -r repository echo "Finished composerRepositoryBuildHook" |