diff options
Diffstat (limited to 'pkgs/top-level/php-packages.nix')
-rw-r--r-- | pkgs/top-level/php-packages.nix | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 62ffa53e54ead..e008dbc233204 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -46,15 +46,18 @@ , fetchpatch }: -lib.makeScope pkgs.newScope (self: with self; { +lib.makeScope pkgs.newScope (self: let + inherit (self) buildPecl callPackage mkExtension php; + + builders = import ../build-support/php/builders { + inherit callPackages callPackage buildPecl; + }; +in { buildPecl = callPackage ../build-support/php/build-pecl.nix { php = php.unwrapped; }; - composerHooks = callPackages ../build-support/php/hooks { }; - - mkComposerRepository = callPackage ../build-support/php/build-composer-repository.nix { }; - buildComposerProject = callPackage ../build-support/php/build-composer-project.nix { }; + inherit (builders.v1) buildComposerProject buildComposerWithPlugin composerHooks mkComposerRepository; # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. @@ -188,6 +191,10 @@ lib.makeScope pkgs.newScope (self: with self; { composer = callPackage ../development/php-packages/composer { }; + composer-local-repo-plugin = callPackage ../development/php-packages/composer-local-repo-plugin { }; + + cyclonedx-php-composer = callPackage ../development/php-packages/cyclonedx-php-composer { }; + deployer = callPackage ../development/php-packages/deployer { }; grumphp = callPackage ../development/php-packages/grumphp { }; @@ -425,10 +432,9 @@ lib.makeScope pkgs.newScope (self: with self; { } { name = "iconv"; - configureFlags = [ - "--with-iconv${lib.optionalString stdenv.isDarwin "=${libiconv}"}" - ]; - doCheck = false; + buildInputs = [ libiconv ]; + configureFlags = [ "--with-iconv" ]; + doCheck = stdenv.isLinux; } { name = "imap"; @@ -672,7 +678,11 @@ lib.makeScope pkgs.newScope (self: with self; { env.NIX_CFLAGS_COMPILE = toString [ "-I../.." "-DHAVE_DOM" ]; configureFlags = [ "--with-xsl=${libxslt.dev}" ]; } - { name = "zend_test"; } + { + name = "zend_test"; + internalDeps = [ php.extensions.dom ]; + env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; + } { name = "zip"; buildInputs = [ libzip pcre2 ]; |