3
0
Fork 0
forked from mirrors/nixpkgs

httpd: Respect original order of environment eval.

This commit is contained in:
Rob Vermaas 2014-01-31 21:18:24 +01:00
parent bfa56d7657
commit 9b1bd84940

View file

@ -628,8 +628,8 @@ in
++ concatMap (svc: svc.extraServerPath) allSubservices;
environment =
(listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices))
// optionalAttrs enablePHP { PHPRC = phpIni; };
optionalAttrs enablePHP { PHPRC = phpIni; }
// (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
preStart =
''