diff options
| author | Elis Hirwing <elis@hirwing.se> | 2020-04-29 19:57:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 19:57:37 +0200 |
| commit | 27b9b7b3af7297a63db72f045d4f1994ae5c8315 (patch) | |
| tree | f92417d2fa6db6c231ffc703c934d447d5cd6898 /nixos/modules/services/web-servers/apache-httpd | |
| parent | 3407b8c0fb25d312d65d1138ff62ca4efc8442cd (diff) | |
| parent | 2535cdfe91b9e0100a2950a128648c2ba509eb8c (diff) | |
Merge pull request #85026 from talyz/php_buildenv_override
php.buildEnv: Make the exported php package overridable, improve handling of currently enabled extensions, etc
Diffstat (limited to 'nixos/modules/services/web-servers/apache-httpd')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 2 |
1 files changed, 1 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 653c17068346f..8abee7130d7c7 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -338,7 +338,7 @@ let } '' cat ${php}/etc/php.ini > $out - cat ${php}/lib/custom-php.ini > $out + cat ${php.phpIni} > $out echo "$options" >> $out ''; |