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

php: fixup build when configured with httpd via nixos

Browse Source
This commit is contained in:
Vladimír Čunát 2016-03-11 11:50:40 +01:00
parent cb1b4e803d
commit c801cd1a04
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ let
httpdConf = mainCfg.configFile; httpdConf = mainCfg.configFile;
php = pkgs.php.override { apacheHttpd = httpd; }; php = pkgs.php.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ };
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;

2
pkgs/development/interpreters/php/default.nix
View File

@ -30,7 +30,7 @@ let
# SAPI modules: # SAPI modules:
apxs2 = { apxs2 = {
configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"]; configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs"];
buildInputs = [apacheHttpd]; buildInputs = [apacheHttpd];
}; };