summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bragi.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/bragi.nix b/bragi.nix
index 9a9153fe..8ccb6b2b 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -98,6 +98,7 @@ in rec {
98 inherit 98 inherit
99 (selfH.callPackage ./custom/thermoprint { inherit (superPkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) 99 (selfH.callPackage ./custom/thermoprint { inherit (superPkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); })
100 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; 100 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
101 bar = superPkgs.callPackage ./bragi/bar { haskellPackages = selfH; };
101 }; 102 };
102 }; 103 };
103 104
@@ -105,7 +106,7 @@ in rec {
105 106
106 mpd = superPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; }; 107 mpd = superPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
107 108
108 inherit (selfPkgs.haskellPackages) thermoprint-server thermoprint-webgui tprint; 109 inherit (selfPkgs.haskellPackages) thermoprint-server thermoprint-webgui tprint bar;
109 }) 110 })
110 ]; 111 ];
111 112
@@ -343,13 +344,14 @@ in rec {
343 APPROOT = "/bar"; 344 APPROOT = "/bar";
344 IP_FROM_HEADER = "true"; 345 IP_FROM_HEADER = "true";
345 }; 346 };
346 requires = [ "postgresql.service" ]; 347 bindsTo = [ "postgresql.service" ];
347 wantedBy = [ "default.target" ]; 348 wantedBy = [ "default.target" ];
349 path = with pkgs; [ bar ];
350 script = ''
351 exec bar
352 '';
348 serviceConfig = { 353 serviceConfig = {
349 Type = "notify"; 354 Type = "notify";
350 ExecStart = ''
351 ${pkgs.callPackage ./bragi/bar {}}/bin/bar
352 '';
353 User = users.extraUsers."bar".name; 355 User = users.extraUsers."bar".name;
354 Group = users.extraUsers."bar".group; 356 Group = users.extraUsers."bar".group;
355 WorkingDirectory = "~"; 357 WorkingDirectory = "~";