Unverified Commit b5855e4e authored by Pol Dellaiera's avatar Pol Dellaiera
Browse files

build-support/php: move environment variables under `env` attribute

parent 6ca2dfea

pkgs/build-support/php/build-composer-project.nix

+5 −3
Original line number Diff line number Diff line
@@ -89,9 +89,11 @@ let 
        composerStrictValidation = previousAttrs.composerStrictValidation or true;

      };



      env = {

        COMPOSER_CACHE_DIR = "/dev/null";

        COMPOSER_DISABLE_NETWORK = "1";

        COMPOSER_MIRROR_PATH_REPOS = "1";

      };



      meta = previousAttrs.meta or { } // {

        platforms = lib.platforms.all;

pkgs/build-support/php/build-composer-repository.nix

+6 −4
Original line number Diff line number Diff line
@@ -106,10 +106,12 @@ let 
          runHook postInstallCheck

        '';



      env = {

        COMPOSER_CACHE_DIR = "/dev/null";

        COMPOSER_MIRROR_PATH_REPOS = "1";

        COMPOSER_HTACCESS_PROTECT = "0";

        COMPOSER_DISABLE_NETWORK = "0";

      };



      outputHashMode = "recursive";

      outputHashAlgo =

pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix

+6 −4
Original line number Diff line number Diff line
@@ -43,10 +43,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    hash = "sha256-edbn07r/Uc1g0qOuVBZBs6N1bMN5kIfA1b4FCufdw5M=";

  };



  env = {

    COMPOSER_CACHE_DIR = "/dev/null";

    COMPOSER_MIRROR_PATH_REPOS = "1";

    COMPOSER_HTACCESS_PROTECT = "0";

    COMPOSER_DISABLE_NETWORK = "1";

  };



  nativeBuildInputs = [ makeBinaryWrapper ];