Merge pull request #55667 from amazari/master

zoneminder: fix build issue when using createLocally database
This commit is contained in:
Peter Hoeg 2019-02-15 22:00:31 +08:00 committed by GitHub
commit 507855e56c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -205,15 +205,13 @@ in {
mysql = lib.mkIf cfg.database.createLocally {
ensureDatabases = [ cfg.database.name ];
ensureUsers = {
ensureUsers = [{
name = cfg.database.username;
ensurePermissions = [
{ "${cfg.database.name}.*" = "ALL PRIVILEGES"; }
];
ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
initialDatabases = [
{ inherit (cfg.database) name; schema = "${pkg}/share/zoneminder/db/zm_create.sql"; }
];
};
}];
};
nginx = lib.mkIf useNginx {