diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix index cbd245df432..a101b077e47 100644 --- a/modules/services/web-servers/apache-httpd/default.nix +++ b/modules/services/web-servers/apache-httpd/default.nix @@ -74,7 +74,7 @@ let phpOptions = ""; options = {}; }; - res = defaults // svcFunction { inherit config pkgs serverInfo; }; + res = defaults // svcFunction { inherit config pkgs serverInfo php; }; in res; in map f defs; diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix index 9f321b173d3..2941c6d0d5a 100644 --- a/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -1,4 +1,4 @@ -{ config, pkgs, serverInfo, ... }: +{ config, pkgs, serverInfo, php, ... }: with pkgs.lib; @@ -101,7 +101,7 @@ let '' ensureDir $out/bin for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php; do - makeWrapper ${pkgs.php}/bin/php $out/bin/mediawiki-${config.id}-$(basename $i .php) \ + makeWrapper ${php}/bin/php $out/bin/mediawiki-${config.id}-$(basename $i .php) \ --add-flags ${mediawikiRoot}/maintenance/$i done '';