Unverified Commit 47c8f08e authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #306532 from SuperSandro2000/tailscale-combine 

tailscale: combine client and daemon binary
parents bcd085b4 ccf4d0c6

pkgs/servers/tailscale/default.nix

+11 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ buildGoModule { 


  CGO_ENABLED = 0;



  subPackages = [ "cmd/tailscale" "cmd/tailscaled" ];

  subPackages = [ "cmd/tailscaled" ];



  ldflags = [

    "-w"
@@ -39,11 +39,18 @@ buildGoModule { 
    "-X tailscale.com/version.shortStamp=${version}"

  ];



  tags = [

    "ts_include_cli"

  ];



  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 ]}

  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