From da20159356b465c647b8d3ce2a2342e2cea290b0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 15 Aug 2016 18:11:00 +0200
Subject: modules/starbound: Fix creation of boot config

The semantics of the boot configuration has changed in version 1.0 and
also in the way we package Starbound, so we no longer need to use jq to
mix in our values and can specify the entire bootconfig in the service
module.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/starbound.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'modules/services')

diff --git a/modules/services/starbound.nix b/modules/services/starbound.nix
index f36593f8..1a5707e4 100644
--- a/modules/services/starbound.nix
+++ b/modules/services/starbound.nix
@@ -55,18 +55,12 @@ let
     queryServerPort = cfg.queryServer.port;
   } // cfg.extraConfig;
 
-  bootConfig = pkgs.runCommand "sbboot.config" {
-    overrides = pkgs.writeText "sbboot.overrides" (builtins.toJSON {
-      logFileBackups = 0;
-      modSource = "";
-      storageDirectory = cfg.dataDir;
-      defaultConfiguration = serverConfig;
-    });
-  } ''
-    "${pkgs.jq}/bin/jq" -s '.[0] * .[1]' \
-      "${cfg.package}/etc/sbboot.config" "$overrides" \
-      > "$out"
-  '';
+  bootConfig = pkgs.writeText "sbinit.config" (builtins.toJSON {
+    logFileBackups = 0;
+    storageDirectory = cfg.dataDir;
+    assetDirectories = singleton (cfg.package.assets);
+    defaultConfiguration = serverConfig;
+  });
 
   # Traverse a given path with ../ until we get to the root directory (/).
   gotoRoot = p: concatStringsSep "/" (map (const "..") (splitString "/" p));
-- 
cgit 1.4.1