diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-05 15:57:20 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-25 00:04:54 +0200 |
commit | 2bcc666fd591dbf7543fc550ff1772508695a746 (patch) | |
tree | 65bb255cbeba40f4c385211bcc32df4c25e6ea6b /overlays/databases | |
parent | 27794e1507ab5bd4b0f31278cf8049854790e4a7 (diff) | |
download | NUR-2bcc666fd591dbf7543fc550ff1772508695a746.tar.gz NUR-2bcc666fd591dbf7543fc550ff1772508695a746.tar.zst NUR-2bcc666fd591dbf7543fc550ff1772508695a746.zip |
Upgrade to nixos-unstable
Diffstat (limited to 'overlays/databases')
-rw-r--r-- | overlays/databases/mysql/default.nix | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/overlays/databases/mysql/default.nix b/overlays/databases/mysql/default.nix index 797332bb..24bad1b6 100644 --- a/overlays/databases/mysql/default.nix +++ b/overlays/databases/mysql/default.nix | |||
@@ -3,16 +3,5 @@ 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 | ''; | ||
12 | }) // (with super.mariadb; { | ||
13 | inherit client; | ||
14 | servier = super.mariadb; | ||
15 | inherit connector-c; | ||
16 | inherit galera; | ||
17 | }); | 6 | }); |
18 | } | 7 | } |