Merge pull request #11141 from cresh/darwin-msmtp

msmtp: Enable on OS X with Keychain integration.
This commit is contained in:
zimbatm 2016-02-27 00:02:53 +00:00
commit 90525b718f
2 changed files with 10 additions and 4 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }:
{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }:
stdenv.mkDerivation rec {
version = "1.6.2";
@ -9,7 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "12c7ljahb06pgn8yvvw526xvr11vnr6d4nr0apylixddpxycsvig";
};
buildInputs = [ openssl pkgconfig gnutls gsasl libidn ];
buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]
++ stdenv.lib.optional stdenv.isDarwin Security;
configureFlags =
stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];
postInstall = ''
cp scripts/msmtpq/msmtp-queue scripts/msmtpq/msmtpq $prefix/bin/
@ -21,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = "http://msmtp.sourceforge.net/";
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

View File

@ -13006,7 +13006,9 @@ let
sxhkd = callPackage ../applications/window-managers/sxhkd { };
msmtp = callPackage ../applications/networking/msmtp { };
msmtp = callPackage ../applications/networking/msmtp {
inherit (darwin.apple_sdk.frameworks) Security;
};
imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix {
lua = lua5;