diff options
| author | Ophestra Umiker <cat@ophivana.moe> | 2024-11-02 03:03:44 +0900 |
|---|---|---|
| committer | Ophestra Umiker <cat@ophivana.moe> | 2024-11-02 03:13:57 +0900 |
| commit | 584732f80ab91afb349720cfb8e9979ed2ba173e (patch) | |
| tree | 8ef6ab9f8c9d3b8197682a53fb2c4a7b2ce8da55 /package.nix | |
| parent | 4b7b899bb35fb4ea218dabe49a674f4d2f80e7f8 (diff) | |
cmd: shim and init into separate binaries
This change also fixes a deadlock when shim fails to connect and complete the setup.
Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
Diffstat (limited to 'package.nix')
| -rw-r--r-- | package.nix | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/package.nix b/package.nix index e96a60ce..39dcff98 100644 --- a/package.nix +++ b/package.nix @@ -15,14 +15,27 @@ buildGoModule rec { src = ./.; vendorHash = null; - ldflags = [ - "-s" - "-w" - "-X" - "main.Version=v${version}" - "-X" - "main.FortifyPath=${placeholder "out"}/bin/.fortify-wrapped" - ]; + ldflags = + lib.attrsets.foldlAttrs + ( + ldflags: name: value: + ldflags + ++ [ + "-X" + "git.ophivana.moe/security/fortify/internal.${name}=${value}" + ] + ) + [ + "-s" + "-w" + ] + { + Version = "v${version}"; + Fmain = "${placeholder "out"}/bin/.fortify-wrapped"; + Fsu = "/run/wrappers/bin/fsu"; + Fshim = "${placeholder "out"}/bin/.fshim"; + Finit = "${placeholder "out"}/bin/.finit"; + }; buildInputs = [ acl @@ -40,5 +53,7 @@ buildGoModule rec { } mv $out/bin/fsu $out/bin/.fsu + mv $out/bin/fshim $out/bin/.fshim + mv $out/bin/finit $out/bin/.finit ''; } |