Remove overlay that overrides the php version

[perso/Immae/Config/Nix.git] / modules / websites / php-application.nix

diff --git a/modules/websites/php-application.nix b/modules/websites/php-application.nix
index 20e2a5dde77311103aa2ab71c4ff53a4f54c3d1e..23e2b233581c3b92cc252360e220155f89fdb537 100644 (file)
--- a/modules/websites/php-application.nix
+++ b/modules/websites/php-application.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ lib, config, pkgs, ... }:
 with lib;
 let
   cfg = config.services.phpApplication;
@@ -53,6 +53,11 @@ in
             default = {};
             description = "Pool environment to append";
           };
+          phpPackage = mkOption {
+            type = attrsOf str;
+            default = pkgs.php;
+            description = "Php package to use";
+          };
           phpOptions = mkOption {
             type = lines;
             default = "";
@@ -177,7 +182,7 @@ in
         // optionalAttrs (icfg.phpSession) { "php_admin_value[session.save_path]" = "${icfg.varDir}/phpSessions"; }
         // icfg.phpPool;
         phpOptions = config.services.phpfpm.phpOptions + icfg.phpOptions;
-        inherit (icfg) phpEnv;
+        inherit (icfg) phpEnv phpPackage;
       }
     ) cfg.apps;