From 47932b3c8e9000a8dc8238cfac5817da9c4132c7 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 17 Jan 2025 22:56:16 +0900 Subject: [PATCH] nix: do not force static linking on nix In a typical Nix or NixOS-based setup, the entire /nix/store directory is available to the sandbox. Signed-off-by: Ophestra --- package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package.nix b/package.nix index 85a3859..0141dda 100644 --- a/package.nix +++ b/package.nix @@ -1,11 +1,16 @@ { lib, buildGoModule, + makeBinaryWrapper, xdg-dbus-proxy, bubblewrap, - pkgsStatic, pkg-config, + libffi, + acl, + wayland, + wayland-protocols, wayland-scanner, + xorg, }: buildGoModule rec { @@ -27,7 +32,6 @@ buildGoModule rec { ) [ "-s -w" - "-extldflags '-static'" "-X main.Fmain=${placeholder "out"}/libexec/fortify" "-X main.Fshim=${placeholder "out"}/libexec/fshim" ] @@ -42,10 +46,7 @@ buildGoModule rec { GO_TEST_SKIP_ACL = 1; buildInputs = - # cannot find a cleaner way to do this - with pkgsStatic; [ - musl libffi acl wayland @@ -60,7 +61,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config wayland-scanner - pkgsStatic.makeBinaryWrapper + makeBinaryWrapper ]; preConfigure = ''