diff options
author | Joachim Fasting <joachifm@fastmail.fm> | 2016-10-24 17:53:50 +0200 |
---|---|---|
committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-10-26 03:01:56 +0200 |
commit | 946fe73b56779210419bb93f4fcf700b1ec67a21 (patch) | |
tree | c22172c5a052432365870427931af0fb8fbc9762 /nixos/modules/services/mail/opensmtpd.nix | |
parent | 37afc5cda13abfbc2dd838e8a242efca1e4cd68a (diff) | |
download | nixlib-946fe73b56779210419bb93f4fcf700b1ec67a21.tar nixlib-946fe73b56779210419bb93f4fcf700b1ec67a21.tar.gz nixlib-946fe73b56779210419bb93f4fcf700b1ec67a21.tar.bz2 nixlib-946fe73b56779210419bb93f4fcf700b1ec67a21.tar.lz nixlib-946fe73b56779210419bb93f4fcf700b1ec67a21.tar.xz nixlib-946fe73b56779210419bb93f4fcf700b1ec67a21.tar.zst nixlib-946fe73b56779210419bb93f4fcf700b1ec67a21.zip |
opensmtpd service: use explicit pkgs for consistency
Diffstat (limited to 'nixos/modules/services/mail/opensmtpd.nix')
-rw-r--r-- | nixos/modules/services/mail/opensmtpd.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index 2de7ef48ad10..c54fd1950cfb 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -1,17 +1,16 @@ { config, lib, pkgs, ... }: -with pkgs; with lib; let cfg = config.services.opensmtpd; - conf = writeText "smtpd.conf" cfg.serverConfiguration; + conf = pkgs.writeText "smtpd.conf" cfg.serverConfiguration; args = concatStringsSep " " cfg.extraServerArgs; sendmail = pkgs.runCommand "opensmtpd-sendmail" {} '' mkdir -p $out/bin - ln -s ${opensmtpd}/sbin/smtpctl $out/bin/sendmail + ln -s ${pkgs.opensmtpd}/sbin/smtpctl $out/bin/sendmail ''; in { @@ -100,7 +99,7 @@ in { systemd.services.opensmtpd = let procEnv = pkgs.buildEnv { name = "opensmtpd-procs"; - paths = [ opensmtpd ] ++ cfg.procPackages; + paths = [ pkgs.opensmtpd ] ++ cfg.procPackages; pathsToLink = [ "/libexec/opensmtpd" ]; }; in { |