From a6b80311eb0f56b8e558ec3514212c09c27e126a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 7 Aug 2021 12:28:40 +1000 Subject: [PATCH] tailscale: buildFlagsArray -> ldflags, tags --- pkgs/servers/tailscale/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 2e1f68f6b12..c642784af92 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -21,12 +21,9 @@ buildGoModule rec { subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; - preBuild = '' - export buildFlagsArray=( - -tags="xversion" - -ldflags="-X tailscale.com/version.Long=${version} -X tailscale.com/version.Short=${version}" - ) - ''; + tags = [ "xversion" ]; + + ldflags = [ "-X tailscale.com/version.Long=${version}" "-X tailscale.com/version.Short=${version}" ]; postInstall = '' wrapProgram $out/bin/tailscaled --prefix PATH : ${