Merge pull request #306532 from SuperSandro2000/tailscale-combine

tailscale: combine client and daemon binary

Sandro 47c8f08e bcd085b4

Changed files
+11 -4
pkgs
servers
tailscale
+11 -4
pkgs/servers/tailscale/default.nix
···
CGO_ENABLED = 0;
-
subPackages = [ "cmd/tailscale" "cmd/tailscaled" ];
ldflags = [
"-w"
···
"-X tailscale.com/version.shortStamp=${version}"
];
doCheck = false;
-
postInstall = lib.optionalString stdenv.isLinux ''
-
wrapProgram $out/bin/tailscaled --prefix PATH : ${lib.makeBinPath [ iproute2 iptables getent shadow ]}
-
wrapProgram $out/bin/tailscale --suffix PATH : ${lib.makeBinPath [ procps ]}
sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service
install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service
···
CGO_ENABLED = 0;
+
subPackages = [ "cmd/tailscaled" ];
ldflags = [
"-w"
···
"-X tailscale.com/version.shortStamp=${version}"
];
+
tags = [
+
"ts_include_cli"
+
];
+
doCheck = false;
+
postInstall = ''
+
ln -s $out/bin/tailscaled $out/bin/tailscale
+
'' + lib.optionalString stdenv.isLinux ''
+
wrapProgram $out/bin/tailscaled \
+
--prefix PATH : ${lib.makeBinPath [ iproute2 iptables getent shadow ]} \
+
--suffix PATH : ${lib.makeBinPath [ procps ]}
sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service
install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service