From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Tue, 7 Apr 2020 21:03:42 +0000 (+0200)
Subject: Upgrade php package for adminer
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=commitdiff_plain;h=c0d1c186b7811daaebea87563978c426856f28d0

Upgrade php package for adminer
---

diff --git a/modules/private/websites/tools/tools/adminer.nix b/modules/private/websites/tools/tools/adminer.nix
index 52a132c..f892841 100644
--- a/modules/private/websites/tools/tools/adminer.nix
+++ b/modules/private/websites/tools/tools/adminer.nix
@@ -1,4 +1,4 @@
-{ adminer, php73, forcePhpSocket ? null }:
+{ adminer, php74, forcePhpSocket ? null }:
 rec {
   activationScript = {
     deps = [ "httpd" ];
@@ -11,18 +11,7 @@ rec {
   phpFpm = rec {
     user = apache.user;
     group = apache.group;
-    phpPackage = (php73.override {
-      config.php.mysqlnd = true;
-      config.php.mysqli = false;
-      config.php.pdo-mysql = false;
-    }).overrideAttrs(old: rec {
-      configureFlags = old.configureFlags ++ [
-        "--with-mysqli=shared,mysqlnd"
-        ];
-    });
-    phpOptions = ''
-      extension=${phpPackage}/lib/php/extensions/mysqli.so
-    '';
+    phpPackage = php74;
     settings = {
       "listen.owner" = apache.user;
       "listen.group" = apache.group;