From 4fab7321bf17b23572c57f05aedbf2271e304074 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Thu, 23 Jul 2015 15:47:16 -0700 Subject: make changes needed to build mongodb --- pkgs/servers/nosql/mongodb/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pkgs/servers/nosql/mongodb') diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 81205c92d4cc..318bda2fe442 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -21,6 +21,10 @@ let version = "3.0.4"; ] ++ optional stdenv.is64bit wiredtiger; other-args = concatStringsSep " " ([ + # these are opt-in, lol + "--cc-use-shell-environment" + "--cxx-use-shell-environment" + "--c++11=on" "--ssl" #"--rocksdb" # Don't have this packaged yet @@ -47,6 +51,13 @@ in stdenv.mkDerivation rec { # fix environment variable reading substituteInPlace SConstruct \ --replace "env = Environment(" "env = Environment(ENV = os.environ," + '' + stdenv.lib.optionalString stdenv.isDarwin '' + + substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder + substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder + substituteInPlace src/third_party/s2/s2cap.cc --replace drem remainder + substituteInPlace src/third_party/s2/s2latlng.cc --replace drem remainder + substituteInPlace src/third_party/s2/s2latlngrect.cc --replace drem remainder ''; buildPhase = '' -- cgit 1.4.1