Skip to content

Commit 3877b43

Browse files
authored
flake.nix: fix broken flake (#85)
Signed-off-by: Mike O'Driscoll <[email protected]>
1 parent a6646a0 commit 3877b43

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

flake.nix

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@
4141
formatter = eachSystem (pkgs: pkgs.nixfmt-tree);
4242

4343
packages = eachSystem (pkgs: {
44-
default = pkgs.buildGo124Module {
44+
tsidp = pkgs.buildGo124Module {
4545
pname = "tsidp";
4646
version = if (self ? shortRev) then self.shortRev else "dev";
4747
src = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
48+
meta.mainProgram = "tsidp";
4849
ldflags =
4950
let
5051
tsVersion =
@@ -59,8 +60,14 @@
5960
];
6061
vendorHash = "sha256-obtcJTg7V4ij3fGVmZMD7QQwKJX6K5PPslpM1XKCk9Q="; # SHA based on vendoring go.mod
6162
};
63+
64+
default = self.packages.${pkgs.system}.tsidp;
6265
});
6366

67+
overlays.default = final: prev: {
68+
tsidp = self.packages.${final.system}.tsidp;
69+
};
70+
6471
devShells = eachSystem (pkgs: {
6572
default = pkgs.mkShell {
6673
packages = [
@@ -95,12 +102,18 @@
95102
;
96103

97104
cfg = config.services.tsidp;
105+
106+
stateDir = "/var/lib/tsidp";
98107
in
99108
{
100109
options.services.tsidp = {
101110
enable = mkEnableOption "tsidp server";
102111

103-
package = mkPackageOption pkgs "tsidp" { };
112+
package = mkOption {
113+
type = lib.types.package;
114+
default = self.packages.${pkgs.system}.tsidp;
115+
description = "Package to use for the tsidp service.";
116+
};
104117

105118
environmentFile = mkOption {
106119
type = nullOr lib.types.path;
@@ -225,7 +238,7 @@
225238
];
226239

227240
environment = {
228-
HOME = "/var/lib/tsidp";
241+
HOME = stateDir;
229242
TAILSCALE_USE_WIP_CODE = "1"; # Needed while tsidp is in development (< v1.0.0).
230243
};
231244

@@ -243,15 +256,16 @@
243256
log = cfg.settings.logLevel;
244257
debug-all-requests = cfg.settings.debugAllRequests;
245258
debug-tsnet = cfg.settings.debugTsnet;
259+
dir = stateDir;
246260
};
247261
in
248262
"${getExe cfg.package} ${args}";
249263
Restart = "always";
250264
RestartSec = "15";
251265

252266
DynamicUser = true;
253-
StateDirectory = "tsidp";
254-
WorkingDirectory = "/var/lib/tsidp";
267+
StateDirectory = baseNameOf stateDir;
268+
WorkingDirectory = stateDir;
255269
ReadWritePaths = mkIf (cfg.settings.useLocalTailscaled) [
256270
"/var/run/tailscale" # needed due to `ProtectSystem = "strict";`
257271
"/var/lib/tailscale"

0 commit comments

Comments
 (0)