From 710ae588851ae5801d2f701a0c9060c8f3aa9185 Mon Sep 17 00:00:00 2001 From: niten Date: Sun, 19 Jun 2022 12:11:44 -0700 Subject: [PATCH] mkCljBin creates an executable. Duh. --- flake.nix | 4 +++- module.nix | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 0cb78e5..efd0448 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,9 @@ defaultPackage = self.packages."${system}".fudo-pricebot; - nixosModule = import ./module.nix self.packages."${system}".fudo-pricebot; + nixosModule = builtins.callPackage ./module.nix { + pricebot = self.packages."${system}".fudo-pricebot; + }; devShell = pkgs.mkShell { buildInputs = with pkgs; [ clojure update-deps ]; }; diff --git a/module.nix b/module.nix index 8ef70ed..8c17647 100644 --- a/module.nix +++ b/module.nix @@ -1,5 +1,4 @@ -pricebot-jar: -{ config, lib, pkgs, ... }: +{ pricebot, config, lib, pkgs, ... }: with lib; let @@ -69,7 +68,7 @@ in { PRICEBOT_NOTIFY_USER = opts.notify-user; }; serviceConfig = { - ExecStart = "${pkgs.jre}/bin/java -jar ${pricebot-jar}"; + ExecStart = "${pricebot}/bin/pricebot"; ExecStartPre = "+${pkgs.coreutils-full}/bin/install --owner=%u --mode=400 -T ${cfg.mattermost-auth-token-file} %T/auth.token"; DynamicUser = true;