pyrox.dev / nixpkgs
lol
fork atom

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

nixos/tinc: Fix tinc cli wrapper for tinc 1.0

authored by Joachim F and committed by GitHub 14930747 8a09e51d

+4 -2
unified split
+4 -2
nixos/modules/services/networking/tinc.nix
··· 199 buildInputs = [ pkgs.makeWrapper ]; 200 buildCommand = '' 201 mkdir -p $out/bin 202 - ${concatStringsSep "\n" (mapAttrsToList (network: data: '' 203 - makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" --add-flags "--pidfile=/run/tinc.${network}.pid" 204 '') cfg.networks)} 205 ''; 206 };
··· 199 buildInputs = [ pkgs.makeWrapper ]; 200 buildCommand = '' 201 mkdir -p $out/bin 202 + ${concatStringsSep "\n" (mapAttrsToList (network: data: 203 + optionalString (versionAtLeast data.package.version "1.1pre") '' 204 + makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" \ 205 + --add-flags "--pidfile=/run/tinc.${network}.pid" 206 '') cfg.networks)} 207 ''; 208 };