Merge pull request #19239 from mattbillenstein/master

mongodb: fix build on OSX by adding Security framework
This commit is contained in:
Daniel Peebles 2016-10-05 00:01:39 -04:00 committed by GitHub
commit 548bcd0de1
2 changed files with 4 additions and 3 deletions

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy
, zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger
, zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security
}:
# Note:
@ -22,8 +22,8 @@ let version = "3.2.9";
buildInputs = [
sasl boost gperftools pcre-cpp snappy
zlib libyamlcpp sasl openssl libpcap
]; # ++ optional stdenv.is64bit wiredtiger;
zlib libyamlcpp sasl openssl.dev openssl.out libpcap
] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
other-args = concatStringsSep " " ([
"--ssl"

View file

@ -10039,6 +10039,7 @@ in
mongodb = callPackage ../servers/nosql/mongodb {
sasl = cyrus_sasl;
inherit (darwin.apple_sdk.frameworks) Security;
};
mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { };