From bfa56d7657e4e4d3f0180e16e20cd7e3e132d919 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 31 Jan 2014 21:14:05 +0100 Subject: [PATCH] httpd: Only add PHPRC to environment of httpd when enablePHP is true. --- nixos/modules/services/web-servers/apache-httpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 2552ec18bb9..d6c539aa78b 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -628,8 +628,8 @@ in ++ concatMap (svc: svc.extraServerPath) allSubservices; environment = - { PHPRC = if enablePHP then phpIni else ""; - } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices)); + (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices)) + // optionalAttrs enablePHP { PHPRC = phpIni; }; preStart = ''