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

Merge pull request #156706 from Luflosi/i2pd-remove-script

Browse Source 
nixos/i2pd: get rid of unnecessary shell script
This commit is contained in:
Timo Kaufmann 2022-02-01 11:52:02 +01:00 committed by GitHub
commit c395fe1e8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/networking/i2pd.nix
View File

@ -222,14 +222,12 @@ let
in concatStringsSep "\n" inTunOpts))]; in concatStringsSep "\n" inTunOpts))];
in pkgs.writeText "i2pd-tunnels.conf" opts; in pkgs.writeText "i2pd-tunnels.conf" opts;
i2pdSh = pkgs.writeScriptBin "i2pd" '' i2pdFlags = concatStringsSep " " (
#!/bin/sh optional (cfg.address != null) ("--host=" + cfg.address) ++ [
exec ${cfg.package}/bin/i2pd \ "--service"
${if cfg.address == null then "" else "--host="+cfg.address} \ ("--conf=" + i2pdConf)
--service \ ("--tunconf=" + tunnelConf)
--conf=${i2pdConf} \ ]);
--tunconf=${tunnelConf}
'';
in in
@ -686,7 +684,7 @@ in
User = "i2pd"; User = "i2pd";
WorkingDirectory = homeDir; WorkingDirectory = homeDir;
Restart = "on-abort"; Restart = "on-abort";
ExecStart = "${i2pdSh}/bin/i2pd"; ExecStart = "${cfg.package}/bin/i2pd ${i2pdFlags}";
}; };
}; };
}; };