mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 13:30:36 +00:00
nixos/tinc: Fix tinc cli wrapper for tinc 1.0.
tinc prior to 1.1 doesn't have the `tinc` executable,
and `tincd` isn't of any use while the daemon already runs.
(cherry picked from commit 8cea87c1eb)
This commit is contained in:
committed by
Joachim Fasting
parent
2fd44d9847
commit
c69ee73db1
@@ -199,8 +199,10 @@ in
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
${concatStringsSep "\n" (mapAttrsToList (network: data: ''
|
||||
makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" --add-flags "--pidfile=/run/tinc.${network}.pid"
|
||||
${concatStringsSep "\n" (mapAttrsToList (network: data:
|
||||
optionalString (versionAtLeast data.package.version "1.1pre") ''
|
||||
makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" \
|
||||
--add-flags "--pidfile=/run/tinc.${network}.pid"
|
||||
'') cfg.networks)}
|
||||
'';
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user