public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29479 from florianjacob/fix-tinc-stable

Browse Source 
nixos/tinc: Fix tinc cli wrapper for tinc 1.0
This commit is contained in:
Joachim F 2017-09-17 13:40:20 +00:00 committed by GitHub
commit 149307476e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/networking/tinc.nix
View File

@ -199,8 +199,10 @@ in
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
${concatStringsSep "\n" (mapAttrsToList (network: data: '' ${concatStringsSep "\n" (mapAttrsToList (network: data:
makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" --add-flags "--pidfile=/run/tinc.${network}.pid" 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)} '') cfg.networks)}
''; '';
}; };