diff --git a/modules/php.nix b/modules/php.nix index 01e24cd..67d21f7 100644 --- a/modules/php.nix +++ b/modules/php.nix @@ -40,7 +40,6 @@ let phpPackage = package.buildEnv { extensions = { all, enabled }: with all; enabled - ++ [ grpc ] ++ (lib.optional config.services.redis.enable redis) ++ (lib.optional config.services.blackfire.enable blackfire) ++ (lib.optional config.services.rabbitmq.enable amqp) @@ -50,7 +49,7 @@ let phpXdebug = package.buildEnv { extensions = { all, enabled }: with all; enabled - ++ [ xdebug grpc ] + ++ [ xdebug ] ++ (lib.optional config.services.redis.enable redis) ++ (lib.optional config.services.rabbitmq.enable amqp) ++ lib.attrsets.attrValues (lib.attrsets.getAttrs cfg.additionalPhpExtensions package.extensions); diff --git a/modules/scripts.nix b/modules/scripts.nix index bf9af46..6159de2 100644 --- a/modules/scripts.nix +++ b/modules/scripts.nix @@ -142,7 +142,9 @@ in { ''; # Processes - processes.entryscript.exec = "${entryScript}"; + processes.entryscript.exec = '' + ${entryScript} + ''; scripts.caddy-trust.exec = '' ${config.services.caddy.package}/bin/caddy trust