diff options
| author | Kim Lindberger <kim.lindberger@gmail.com> | 2020-06-11 21:02:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 21:02:48 +0200 |
| commit | d2458967895d53df9738f189c49a02b39b6463f9 (patch) | |
| tree | 94e0bdb588b3ddcc3871f6f39605d962301d1df9 | |
| parent | 23eabcc562883bc75fe95f306ccae4463e75a03c (diff) | |
| parent | 1f13d6506f3998e84f32ec92cc768b1d5562ad1e (diff) | |
| download | nixpkgs-d2458967895d53df9738f189c49a02b39b6463f9.tar nixpkgs-d2458967895d53df9738f189c49a02b39b6463f9.tar.gz nixpkgs-d2458967895d53df9738f189c49a02b39b6463f9.tar.bz2 nixpkgs-d2458967895d53df9738f189c49a02b39b6463f9.tar.lz nixpkgs-d2458967895d53df9738f189c49a02b39b6463f9.tar.xz nixpkgs-d2458967895d53df9738f189c49a02b39b6463f9.tar.zst nixpkgs-d2458967895d53df9738f189c49a02b39b6463f9.zip | |
Merge pull request #90139 from doronbehar/mariadb-unblock
mariadb: don't move pam files on Darwin
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9c2134e211f..d6e52134301 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -201,12 +201,12 @@ server = stdenv.mkDerivation (common // { chmod +x "$out"/bin/wsrep_sst_common rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} rm -r "$out"/data # Don't need testing data - mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security - mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security - rm -r "$out"/OFF '' + optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString (!stdenv.hostPlatform.isDarwin) '' + mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security + mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security + rm -r "$out"/OFF sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster ''; |