diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-22 04:23:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 04:23:24 +0200 |
| commit | b231ac2101b1d5289525ff60fdaa442680570740 (patch) | |
| tree | e5a30e606fea68874d57dbf753e3724108b62254 /nixos/modules/services/web-servers | |
| parent | d3a41f3c23b5f7b88613f57d6c7f6b86d662df55 (diff) | |
| parent | 4816b426a057df94f0533d783d3cf6a4c5607aa3 (diff) | |
| download | nixlib-b231ac2101b1d5289525ff60fdaa442680570740.tar nixlib-b231ac2101b1d5289525ff60fdaa442680570740.tar.gz nixlib-b231ac2101b1d5289525ff60fdaa442680570740.tar.bz2 nixlib-b231ac2101b1d5289525ff60fdaa442680570740.tar.lz nixlib-b231ac2101b1d5289525ff60fdaa442680570740.tar.xz nixlib-b231ac2101b1d5289525ff60fdaa442680570740.tar.zst nixlib-b231ac2101b1d5289525ff60fdaa442680570740.zip | |
Merge pull request #85402 from jtojnar/httpd-php
Diffstat (limited to 'nixos/modules/services/web-servers')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 832c8b30ee9d..5e55baa203a0 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -12,7 +12,7 @@ let httpdConf = cfg.configFile; - php = cfg.phpPackage.override { apacheHttpd = pkg.dev; /* otherwise it only gets .out */ }; + php = cfg.phpPackage.override { apacheHttpd = pkg; }; phpMajorVersion = lib.versions.major (lib.getVersion php); @@ -338,6 +338,7 @@ let } '' cat ${php}/etc/php.ini > $out + cat ${php}/lib/custom-php.ini > $out echo "$options" >> $out ''; |