diff --git a/hosts/nixos/lapetus/services/glass-server/module.nix b/hosts/nixos/lapetus/services/glass-server/module.nix index 441cf9e..f099803 100644 --- a/hosts/nixos/lapetus/services/glass-server/module.nix +++ b/hosts/nixos/lapetus/services/glass-server/module.nix @@ -25,6 +25,8 @@ let LOG_BASE_DIR = "${cfg.dataDir}/log"; WORLD_MAP_FOLDER_PATH = "${cfg.dataDir}/map/"; + WORLD_MAP_LEPHON_NELL_FOLDER_PATH = "${pkg}/source/database/map_lephon_nell"; + SONG_FILE_FOLDER_PATH = "${cfg.dataDir}/songs/"; SONGLIST_FILE_PATH = "${cfg.dataDir}/songs/songlist"; CONTENT_BUNDLE_FOLDER_PATH = "${cfg.dataDir}/bundle/"; @@ -93,12 +95,13 @@ in systemd.tmpfiles.rules = [ "f ${cfg.dataDir}/config.json 0700 ${cfg.user} ${cfg.user}" "d ${cfg.dataDir}/log 0700 ${cfg.user} ${cfg.user}" - "d ${cfg.dataDir}/map 0700 ${cfg.user} ${cfg.user}" - "d ${cfg.dataDir}/songs 0700 ${cfg.user} ${cfg.user}" - "d ${cfg.dataDir}/bundle 0700 ${cfg.user} ${cfg.user}" "d ${cfg.dataDir}/backup 0700 ${cfg.user} ${cfg.user}" "d ${cfg.dataDir}/database 0700 ${cfg.user} ${cfg.user}" + "d ${cfg.dataDir}/map 0755 ${cfg.user} ${cfg.user}" + "d ${cfg.dataDir}/songs 0755 ${cfg.user} ${cfg.user}" + "d ${cfg.dataDir}/bundle 0755 ${cfg.user} ${cfg.user}" + "L+ ${cfg.dataDir}/pkgs/server 0755 ${cfg.user} ${cfg.user} - ${pkg}" "L+ ${cfg.dataDir}/pkgs/db 0755 ${cfg.user} ${cfg.user} - ${databaseRepo}" ]; diff --git a/pkgs/glass-server.nix b/pkgs/glass-server.nix index 3ea5576..2d29d48 100644 --- a/pkgs/glass-server.nix +++ b/pkgs/glass-server.nix @@ -17,8 +17,8 @@ pkgs.stdenv.mkDerivation { src = pkgs.fetchFromGitHub { owner = "starlitcanopy"; repo = "ArcaeaServerFork"; - rev = "10cb099a072cc6feb390e3249ecff7867ccd22c6"; - sha256 = "1wzf2si9zvvsb36cg1mghw80fjnv8jic3krlf0nppsm8qmkb03hg"; + rev = "826def0067a3af2f527756afc64da79cb15d5774"; + sha256 = "0by5hzw79v0ny86yysvpihmjprgpxc9427al69ipcjb2yrza723z"; }; buildPhase = ''