aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/private/system.nix5
-rw-r--r--overlays/databases/mysql/default.nix3
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 @@
13 ''; 13 '';
14 }; 14 };
15 nixpkgs.overlays = builtins.attrValues (import ../../overlays) ++ [ 15 nixpkgs.overlays = builtins.attrValues (import ../../overlays) ++ [
16 (self: super: { postgresql = self.postgresql_pam; }) # don’t put it as generic overlay for home-manager 16 (self: super: {
17 postgresql = self.postgresql_pam;
18 mariadb = self.mariadb_pam;
19 }) # don’t put them as generic overlay because of home-manager
17 ]; 20 ];
18 _module.args = { 21 _module.args = {
19 pkgsNext = import <nixpkgsNext> {}; 22 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 @@
1self: super: rec { 1self: super: rec {
2 mariadb = mariadbPAM; 2 mariadb_pam = super.mariadb.overrideAttrs(old: {
3 mariadbPAM = super.mariadb.overrideAttrs(old: {
4 cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; 3 cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ];
5 buildInputs = old.buildInputs ++ [ self.pam ]; 4 buildInputs = old.buildInputs ++ [ self.pam ];
6 }); 5 });