summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Fullmer <danielrf12@gmail.com>2020-04-10 19:11:24 -0400
committerDaniel Fullmer <danielrf12@gmail.com>2020-05-17 13:42:42 -0400
commite958afa0a9a12de3e623a464a922ac7f9455c0d0 (patch)
tree0c85a93540a09b1ee73765fe1ab76502fd45b2b8
parent28c2c0156da98dbe553490f904da92ed436df134 (diff)
downloadnixpkgs-e958afa0a9a12de3e623a464a922ac7f9455c0d0.tar
nixpkgs-e958afa0a9a12de3e623a464a922ac7f9455c0d0.tar.gz
nixpkgs-e958afa0a9a12de3e623a464a922ac7f9455c0d0.tar.bz2
nixpkgs-e958afa0a9a12de3e623a464a922ac7f9455c0d0.tar.lz
nixpkgs-e958afa0a9a12de3e623a464a922ac7f9455c0d0.tar.xz
nixpkgs-e958afa0a9a12de3e623a464a922ac7f9455c0d0.tar.zst
nixpkgs-e958afa0a9a12de3e623a464a922ac7f9455c0d0.zip
nixos/zoneminder: fix evaluation with php refactor
-rw-r--r--nixos/modules/services/misc/zoneminder.nix8
1 files changed, 1 insertions, 7 deletions
diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix
index d5b3537068d..d9d34b7fac9 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixos/modules/services/misc/zoneminder.nix
@@ -63,10 +63,6 @@ let
     ${cfg.extraConfig}
   '';
 
-  phpExtensions = with pkgs.phpPackages; [
-    { pkg = apcu; name = "apcu"; }
-  ];
-
 in {
   options = {
     services.zoneminder = with lib; {
@@ -289,11 +285,9 @@ in {
       phpfpm = lib.mkIf useNginx {
         pools.zoneminder = {
           inherit user group;
+          phpPackage = pkgs.php.withExtensions ({ enabled, all }: enabled ++ [ all.apcu ]);
           phpOptions = ''
             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) {
             "listen.owner" = user;