diff --git a/nix/image/php-ext.nix b/nix/image/php-ext.nix index 2715cf2..69d23e1 100644 --- a/nix/image/php-ext.nix +++ b/nix/image/php-ext.nix @@ -35,6 +35,7 @@ in gmp apcu ffi + imagick ] ++ optionals (!debug) [ smbclient # this breaks the build for no apparent reason diff --git a/nix/image/php.nix b/nix/image/php.nix index 4922655..8ef3d31 100644 --- a/nix/image/php.nix +++ b/nix/image/php.nix @@ -2,27 +2,23 @@ lib, php, debug ? false, -}: let - inherit (builtins) compareVersions; - inherit (lib) optionals; - withBlackfire = !debug && ((compareVersions php.version "8.1.0") == 1); -in - php.buildEnv { - extensions = import ./php-ext.nix {inherit lib php debug;}; - extraConfig = '' - xdebug.mode=debug,trace,profile - xdebug.start_with_request=trigger - xdebug.discover_client_host=false - xdebug.client_host=hazehost - xdebug.log_level=0 - xdebug.output_dir=/tmp/xdebug +}: +php.buildEnv { + extensions = import ./php-ext.nix {inherit lib php debug;}; + extraConfig = '' + xdebug.mode=debug,trace,profile + xdebug.start_with_request=trigger + xdebug.discover_client_host=false + xdebug.client_host=hazehost + xdebug.log_level=0 + xdebug.output_dir=/tmp/xdebug - memory_limit=512M + memory_limit=512M - post_max_size 10G - upload_max_filesize 10G + post_max_size 10G + upload_max_filesize 10G - apc.enable_cli=1 - opcache.enable_cli=1 - ''; - } + apc.enable_cli=1 + opcache.enable_cli=1 + ''; +}