clean source

This commit is contained in:
2020-12-27 19:32:57 +01:00
parent 3cc5617307
commit 45dd09183d
2 changed files with 7 additions and 5 deletions

View File

@@ -3,6 +3,7 @@ with lib;
let
cfg = config.services.brownpaper;
cfgc = config.programs.brownpaper;
package = pkgs.callPackage ./. { inherit pkgs; src = ./.; };
keyDir = pkgs.runCommand "brownpaper-keys" { } ''
mkdir -p $out
${concatStringsSep " && " (builtins.map (key: "ln -s ${key} $out") cfg.pgpKeys)}
@@ -86,7 +87,7 @@ in
serviceConfig =
{
BindPaths = [ cfg.dataDir ];
ExecStart = "${(pkgs.callPackage ./. { inherit pkgs; src = ./.; }).server.rootCrate.build}/bin/brownpaper ${cfg.listen}:${toString cfg.port}";
ExecStart = "${package.server.rootCrate.build}/bin/brownpaper ${cfg.listen}:${toString cfg.port}";
User = cfg.user;
};
};
@@ -96,7 +97,7 @@ in
};
environment.systemPackages = optionals cfgc.enable [
(pkgs.writeShellScriptBin "brownpaper" ''
BROWNPAPER_ENDPOINT='${cfgc.endpoint}' ${(pkgs.callPackage ./. { inherit pkgs; src = ./.; }).client}/bin/brownpaper "$@"
BROWNPAPER_ENDPOINT='${cfgc.endpoint}' ${package.client}/bin/brownpaper "$@"
'')
];
};