From 4e3e4761c8566cbc47c64d66bfc21bb6dee32860 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Fri, 8 May 2020 01:34:59 +0200
Subject: [PATCH] Remove mariadb with pam overlay

---
 modules/private/system.nix           | 5 ++++-
 overlays/databases/mysql/default.nix | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/private/system.nix b/modules/private/system.nix
index b4080ec..9161738 100644
--- a/modules/private/system.nix
+++ b/modules/private/system.nix
@@ -13,7 +13,10 @@
         '';
     };
     nixpkgs.overlays = builtins.attrValues (import ../../overlays) ++ [
-      (self: super: { postgresql = self.postgresql_pam; }) # don’t put it as generic overlay for home-manager
+      (self: super: {
+        postgresql = self.postgresql_pam;
+        mariadb = self.mariadb_pam;
+      }) # don’t put them as generic overlay because of home-manager
     ];
     _module.args = {
       pkgsNext = import <nixpkgsNext> {};
diff --git a/overlays/databases/mysql/default.nix b/overlays/databases/mysql/default.nix
index 24bad1b..4302cd1 100644
--- a/overlays/databases/mysql/default.nix
+++ b/overlays/databases/mysql/default.nix
@@ -1,6 +1,5 @@
 self: super: rec {
-  mariadb = mariadbPAM;
-  mariadbPAM = super.mariadb.overrideAttrs(old: {
+  mariadb_pam = super.mariadb.overrideAttrs(old: {
     cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ];
     buildInputs = old.buildInputs ++ [ self.pam ];
   });
-- 
2.41.0