Unverified Commit c5a8fd5d authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #309314 from drupol/php/build-support/minor-changes 

build-support/php: minor refactoring
parents 6e3c9cc7 31bdcac6

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

+22 −22
Original line number Diff line number Diff line
@@ -2,11 +2,8 @@ 
  callPackage,

  stdenvNoCC,

  lib,

  writeTextDir,

  php,

  makeBinaryWrapper,

  fetchFromGitHub,

  fetchurl,

}:



let
@@ -75,7 +72,8 @@ let 
          runHook postInstallCheck

        '';



      composerRepository = phpDrv.mkComposerRepository {

      composerRepository =

        previousAttrs.composerRepository or (phpDrv.mkComposerRepository {

          inherit composer composer-local-repo-plugin;

          inherit (finalAttrs)

            patches
@@ -90,11 +88,13 @@ let 
          composerNoPlugins = previousAttrs.composerNoPlugins or true;

          composerNoScripts = previousAttrs.composerNoScripts or true;

          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 −5
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  callPackage,

  stdenvNoCC,

  lib,

  writeTextDir,

  fetchFromGitHub,

  php,

}:
@@ -107,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 ];

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

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 


    mkdir -p $out/bin

    install -D $src $out/libexec/composer/composer.phar

    makeWrapper ${php}/bin/php $out/bin/composer \

    makeWrapper ${lib.getExe php} $out/bin/composer \

      --add-flags "$out/libexec/composer/composer.phar" \

      --prefix PATH : ${

        lib.makeBinPath [
@@ -53,6 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    description = "Dependency Manager for PHP, shipped from the PHAR file";

    homepage = "https://getcomposer.org/";

    license = lib.licenses.mit;

    mainProgram = "composer";

    maintainers = with lib.maintainers; [ drupol ];

    platforms = lib.platforms.all;

  };