@@ -22,7 +22,9 @@ let
2222
2323 php = cfg.phpPackage.override { apacheHttpd = pkg; };
2424
25− phpMajorVersion = lib.versions.major (lib.getVersion php);
25+ phpModuleName = let
26+ majorVersion = lib.versions.major (lib.getVersion php);
27+ in (if majorVersion == "8" then "php" else "php${majorVersion}");
2628
2729 mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = pkg; };
2830
@@ -63,7 +65,7 @@ let
6365 ++ optional enableSSL "ssl"
6466 ++ optional enableUserDir "userdir"
6567 ++ optional cfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; }
66− ++ optional cfg.enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; }
68+ ++ optional cfg.enablePHP { name = phpModuleName; path = "${php}/modules/lib${phpModuleName}.so"; }
6769 ++ optional cfg.enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; }
6870 ++ cfg.extraModules;
6971