diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-24 14:47:43 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-24 14:47:43 +0200 |
commit | 5621b77a33b311e82c8870f6872a2beffef9dbd0 (patch) | |
tree | 1d561826278871fa8c065ff84cdadc0922cb758b /pkgs/applications/networking/msmtp/default.nix | |
parent | 658335d6a88b623ab926dea99425e2716afa7f4e (diff) | |
parent | 322fa6b06cfbe66ef1bc12b1bfd5fd37d63cbf87 (diff) | |
download | nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.gz nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.bz2 nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.lz nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.xz nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.zst nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/networking/msmtp/default.nix')
-rw-r--r-- | pkgs/applications/networking/msmtp/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 85e5abdc9b6..1a409fc885a 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, autoreconfHook, pkgconfig , openssl, netcat-gnu, gnutls, gsasl, libidn, Security +, withKeyring ? true, libsecret ? null , systemd ? null }: let @@ -20,7 +21,9 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl gnutls gsasl libidn ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ stdenv.lib.optional stdenv.isDarwin Security + ++ stdenv.lib.optional withKeyring libsecret; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; configureFlags = |