mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-07 21:13:59 +00:00
Merge pull request #90139 from doronbehar/mariadb-unblock
mariadb: don't move pam files on Darwin
This commit is contained in:
commit
d245896789
|
@ -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
|
||||
'';
|
||||
|
||||
|
|
Loading…
Reference in a new issue