Merge pull request #11141 from cresh/darwin-msmtp

msmtp: Enable on OS X with Keychain integration.

+10 -4
+7 -3
pkgs/applications/networking/msmtp/default.nix
··· 1 - { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }: 1 + { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 version = "1.6.2"; ··· 9 9 sha256 = "12c7ljahb06pgn8yvvw526xvr11vnr6d4nr0apylixddpxycsvig"; 10 10 }; 11 11 12 - buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]; 12 + buildInputs = [ openssl pkgconfig gnutls gsasl libidn ] 13 + ++ stdenv.lib.optional stdenv.isDarwin Security; 14 + 15 + configureFlags = 16 + stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; 13 17 14 18 postInstall = '' 15 19 cp scripts/msmtpq/msmtp-queue scripts/msmtpq/msmtpq $prefix/bin/ ··· 21 25 homepage = "http://msmtp.sourceforge.net/"; 22 26 license = stdenv.lib.licenses.gpl3; 23 27 maintainers = [ stdenv.lib.maintainers.garbas ]; 24 - platforms = stdenv.lib.platforms.linux; 28 + platforms = stdenv.lib.platforms.unix; 25 29 }; 26 30 }
+3 -1
pkgs/top-level/all-packages.nix
··· 13006 13006 13007 13007 sxhkd = callPackage ../applications/window-managers/sxhkd { }; 13008 13008 13009 - msmtp = callPackage ../applications/networking/msmtp { }; 13009 + msmtp = callPackage ../applications/networking/msmtp { 13010 + inherit (darwin.apple_sdk.frameworks) Security; 13011 + }; 13010 13012 13011 13013 imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { 13012 13014 lua = lua5;