b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos/zoneminder: fix evaluation with php refactor

Browse source
This commit is contained in:
Daniel Fullmer 2020-04-10 19:11:24 -04:00
parent 28c2c0156d
commit e958afa0a9
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/misc/zoneminder.nix
View file

@ -63,10 +63,6 @@ let
${cfg.extraConfig} ${cfg.extraConfig}
''; '';
phpExtensions = with pkgs.phpPackages; [
{ pkg = apcu; name = "apcu"; }
];
in { in {
options = { options = {
services.zoneminder = with lib; { services.zoneminder = with lib; {
@ -289,11 +285,9 @@ in {
phpfpm = lib.mkIf useNginx { phpfpm = lib.mkIf useNginx {
pools.zoneminder = { pools.zoneminder = {
inherit user group; inherit user group;
phpPackage = pkgs.php.withExtensions ({ enabled, all }: enabled ++ [ all.apcu ]);
phpOptions = '' phpOptions = ''
date.timezone = "${config.time.timeZone}" date.timezone = "${config.time.timeZone}"
${lib.concatStringsSep "\n" (map (e:
"extension=${e.pkg}/lib/php/extensions/${e.name}.so") phpExtensions)}
''; '';
settings = lib.mapAttrs (name: lib.mkDefault) { settings = lib.mapAttrs (name: lib.mkDefault) {
"listen.owner" = user; "listen.owner" = user;