diff options
Diffstat (limited to 'overlays/databases')
-rw-r--r-- | overlays/databases/mysql/default.nix | 6 | ||||
-rw-r--r-- | overlays/databases/postgresql/default.nix | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/overlays/databases/mysql/default.nix b/overlays/databases/mysql/default.nix index 5e402841..797332bb 100644 --- a/overlays/databases/mysql/default.nix +++ b/overlays/databases/mysql/default.nix | |||
@@ -3,6 +3,12 @@ self: super: rec { | |||
3 | mariadbPAM = super.mariadb.overrideAttrs(old: { | 3 | mariadbPAM = super.mariadb.overrideAttrs(old: { |
4 | cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; | 4 | cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; |
5 | buildInputs = old.buildInputs ++ [ self.pam ]; | 5 | buildInputs = old.buildInputs ++ [ self.pam ]; |
6 | postInstall = old.postInstall + '' | ||
7 | # FIXME: hack because mariadb cannot find dialog.so | ||
8 | # fixed in 20.03: https://github.com/NixOS/nixpkgs/pull/80768 | ||
9 | ln -s /nix $out/nix | ||
10 | cp "$dev"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$out"/lib/mysql/plugin | ||
11 | ''; | ||
6 | }) // (with super.mariadb; { | 12 | }) // (with super.mariadb; { |
7 | inherit client; | 13 | inherit client; |
8 | servier = super.mariadb; | 14 | servier = super.mariadb; |
diff --git a/overlays/databases/postgresql/default.nix b/overlays/databases/postgresql/default.nix index 8d1405e3..ae589877 100644 --- a/overlays/databases/postgresql/default.nix +++ b/overlays/databases/postgresql/default.nix | |||
@@ -4,8 +4,5 @@ self: super: rec { | |||
4 | passthru = old.passthru // { psqlSchema = "11.0"; }; | 4 | passthru = old.passthru // { psqlSchema = "11.0"; }; |
5 | configureFlags = old.configureFlags ++ [ "--with-pam" ]; | 5 | configureFlags = old.configureFlags ++ [ "--with-pam" ]; |
6 | buildInputs = (old.buildInputs or []) ++ [ self.pam ]; | 6 | buildInputs = (old.buildInputs or []) ++ [ self.pam ]; |
7 | patches = old.patches ++ [ | ||
8 | ./postgresql_run_socket_path.patch | ||
9 | ]; | ||
10 | }); | 7 | }); |
11 | } | 8 | } |