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

mediawiki.nix: Use the right PHP build

Browse Source
This commit is contained in:
Eelco Dolstra 2012-07-30 17:19:14 +02:00
parent e27ee81304
commit a559a2a606
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ let
phpOptions = ""; phpOptions = "";
options = {}; options = {};
}; };
res = defaults // svcFunction { inherit config pkgs serverInfo; }; res = defaults // svcFunction { inherit config pkgs serverInfo php; };
in res; in res;
in map f defs; in map f defs;

4
modules/services/web-servers/apache-httpd/mediawiki.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, serverInfo, ... }: { config, pkgs, serverInfo, php, ... }:
with pkgs.lib; with pkgs.lib;
@ -101,7 +101,7 @@ let
'' ''
ensureDir $out/bin ensureDir $out/bin
for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php; do 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 --add-flags ${mediawikiRoot}/maintenance/$i
done done
''; '';