@@ -1,26 +1,25 @@
1−{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy, zlib,
2− libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security, python27, curl, CoreFoundation, cctools
3−}:
1+{ stdenv, fetchurl, scons, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp
2+, sasl, openssl, libpcap, python27, curl, Security, CoreFoundation, cctools }:
43
54# Note:
65# The command line tools are written in Go as part of a different package (mongodb-tools)
76
87with stdenv.lib;
98
10−{ version, sha256, patches ? [ ] }@args:
9+{ version, sha256, patches ? [] }@args:
1110
1211let
1312 python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
1413 system-libraries = [
15− "pcre"
16− #"asio" -- XXX use package?
17− #"wiredtiger"
1814 "boost"
15+ "pcre"
1916 "snappy"
17+ "yaml"
2018 "zlib"
21− #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source.
19+ #"asio" -- XXX use package?
2220 #"stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs).
23− "yaml"
21+ #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source.
22+ #"wiredtiger"
2423 ] ++ optionals stdenv.isLinux [ "tcmalloc" ];
2524 inherit (stdenv.lib) systems subtractLists;
2625
@@ -35,8 +34,18 @@ in stdenv.mkDerivation rec {
3534
3635 nativeBuildInputs = [ scons ];
3736 buildInputs = [
38− sasl boost gperftools pcre-cpp snappy
39− zlib libyamlcpp sasl openssl.dev openssl.out libpcap python curl
37+ boost
38+ curl
39+ gperftools
40+ libpcap
41+ libyamlcpp
42+ openssl.dev
43+ openssl.out
44+ pcre-cpp
45+ python
46+ sasl
47+ snappy
48+ zlib
4049 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ];
4150
4251 # MongoDB keeps track of its build parameters, which tricks nix into
@@ -84,10 +93,6 @@ in stdenv.mkDerivation rec {
8493 sconsFlags+=" CXX=$CXX"
8594 '' + optionalString stdenv.isAarch64 ''
8695 sconsFlags+=" CCFLAGS='-march=armv8-a+crc'"
87− '' + optionalString stdenv.isDarwin ''
88− sconsFlags+=" CPPPATH=${openssl.dev}/include"
89− '' + optionalString stdenv.isDarwin ''
90− sconsFlags+=" LIBPATH=${openssl.out}/lib"
9196 '';
9297
9398 preInstall = ''