···

       
169
       
169
       
 
       
        serviceConfig = {

     

       
170
       
170
       
 
       
          Type = "simple";

     

       
171
       
171
       
 
       
          PIDFile = "/run/tinc.${network}.pid";

     

       
172
       
172
       
-
       
          Restart = "on-failure";

     

       
172
       
172
       
+
       
          Restart = "always";

     

       
173
       
173
       
+
       
          RestartSec = "3";

     

       
173
       
174
       
 
       
        };

     

       
174
       
175
       
 
       
        preStart = ''

     

       
175
       
176
       
 
       
          mkdir -p /etc/tinc/${network}/hosts

     

···

       
1
       
1
       
-
       
{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:

     

       
1
       
1
       
+
       
{ stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
 
       
  name = "tinc-${version}";

     
···

       
18
       
18
       
 
       
  prePatch = ''

     

       
19
       
19
       
 
       
    substituteInPlace configure.ac --replace UNKNOWN ${version}

     

       
20
       
20
       
 
       
  '';

     

       
21
       
21
       
+
       


     

       
22
       
22
       
+
       
  patches = [

     

       
23
       
23
       
+
       
    # Avoid infinite loop with "Error while reading from Linux tun/tap device (tun mode) /dev/net/tun: File descriptor in bad state" on network restart

     

       
24
       
24
       
+
       
    (fetchpatch {

     

       
25
       
25
       
+
       
      url = https://github.com/gsliepen/tinc/compare/acefa66...e4544db.patch;

     

       
26
       
26
       
+
       
      sha256 = "1jz7anqqzk7j96l5ifggc2knp14fmbsjdzfrbncxx0qhb6ihdcvn";

     

       
27
       
27
       
+
       
    })

     

       
28
       
28
       
+
       
  ];

     

       
21
       
29
       
 
       


     

       
22
       
30
       
 
       
  postInstall = ''

     

       
23
       
31
       
 
       
    rm $out/bin/tinc-gui