JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apache: build PHP against the right httpd

Browse Source 
If httpd is built with a threaded MPM, then PHP needs to be built with
thread support as well.
This commit is contained in:
Eelco Dolstra 2012-07-06 23:28:46 +02:00
parent 18031e41bb
commit d0c9a3ce32
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/services/web-servers/apache-httpd/default.nix
View File

@ -8,6 +8,8 @@ let
httpd = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; }; httpd = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
php = pkgs.php.override { apacheHttpd = httpd; };
getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80; getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
extraModules = attrByPath ["extraModules"] [] mainCfg; extraModules = attrByPath ["extraModules"] [] mainCfg;
@ -308,7 +310,7 @@ let
allModules = allModules =
concatMap (svc: svc.extraModulesPre) allSubservices concatMap (svc: svc.extraModulesPre) allSubservices
++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules
++ optional enablePHP { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; } ++ optional enablePHP { name = "php5"; path = "${php}/modules/libphp5.so"; }
++ concatMap (svc: svc.extraModules) allSubservices ++ concatMap (svc: svc.extraModules) allSubservices
++ extraForeignModules; ++ extraForeignModules;
in concatMapStrings load allModules in concatMapStrings load allModules
@ -379,7 +381,7 @@ let
([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices)); ([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices));
} }
'' ''
cat ${pkgs.php}/etc/php-recommended.ini > $out cat ${php}/etc/php-recommended.ini > $out
echo "$options" >> $out echo "$options" >> $out
''; '';
@ -410,7 +412,7 @@ in
extraModules = mkOption { extraModules = mkOption {
default = []; default = [];
example = [ "proxy_connect" { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; } ]; example = [ "proxy_connect" { name = "php5"; path = "${php}/modules/libphp5.so"; } ];
description = '' description = ''
Specifies additional Apache modules. These can be specified Specifies additional Apache modules. These can be specified
as a string in the case of modules distributed with Apache, as a string in the case of modules distributed with Apache,