proc/priv/shim: merge shim into main program

Signed-off-by: Ophestra <cat@gensokyo.uk>
internal: do PR_SET_PDEATHSIG once
2025-01-17 23:43:32 +09:00 · 2025-01-17 23:08:46 +09:00 · 2025-01-17 22:56:16 +09:00 · 2025-01-16 17:32:52 +09:00
1 changed files with 22 additions and 2 deletions
--- a/flake.nix
+++ b/flake.nix
@ -166,8 +166,28 @@
                go
                gcc
              ]
-              ++ fortify.buildInputs
-              ++ fortify.nativeBuildInputs;
+              # buildInputs
+              ++ (
+                with pkgsStatic;
+                [
+                  musl
+                  libffi
+                  acl
+                  wayland
+                  wayland-protocols
+                ]
+                ++ (with xorg; [
+                  libxcb
+                  libXau
+                  libXdmcp
+                ])
+              )
+              # nativeBuildInputs
+              ++ [
+                pkg-config
+                wayland-scanner
+                makeBinaryWrapper
+              ];
          };

          fhs = fhs.env;
Author	SHA1	Message	Date
Ophestra	ea8f228af3	proc/priv/shim: merge shim into main program All checks were successful Build / Create distribution (push) Successful in 2m15s Details Test / Run NixOS test (push) Successful in 2m53s Details Signed-off-by: Ophestra <cat@gensokyo.uk>	2025-01-17 23:43:32 +09:00
Ophestra	16db3dabe2	internal: do PR_SET_PDEATHSIG once All checks were successful Build / Create distribution (push) Successful in 3m7s Details Test / Run NixOS test (push) Successful in 4m40s Details This prctl affects the entire process, doing it on every OS thread is pointless. Signed-off-by: Ophestra <cat@gensokyo.uk>	2025-01-17 23:08:46 +09:00
Ophestra	c4de450217	nix: do not force static linking on nix All checks were successful Build / Create distribution (push) Successful in 3m14s Details Test / Run NixOS test (push) Successful in 3m25s Details In a typical Nix or NixOS-based setup, the entire /nix/store directory is available to the sandbox. Signed-off-by: Ophestra <cat@gensokyo.uk>	2025-01-17 22:56:16 +09:00
Ophestra	b60c01f440	fortify: switch to static linking All checks were successful Build / Create distribution (push) Successful in 1m43s Details Test / Run NixOS test (push) Successful in 4m32s Details Signed-off-by: Ophestra <cat@gensokyo.uk>	2025-01-16 17:32:52 +09:00